From bd2c8c92f1b30d8f811bd4aab0fe3a2c5496ec61 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Wed, 29 Feb 2012 19:23:01 -0800
Subject: yet more work on notifications

---
 include/enotify.php | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'include/enotify.php')

diff --git a/include/enotify.php b/include/enotify.php
index 80cb7d8fa..a505f1f04 100755
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -25,11 +25,8 @@ function notification($params) {
 		$title = $body = '';
 	}
 
-	if($params['otype'] === 'item')
-		$possess_desc = t('%s post');
-	if($params['otype'] == 'photo')
-		$possess_desc = t('%s photo');
-
+	// e.g. "your post", "David's photo", etc.
+	$possess_desc = t('%s <!item_type!>');
 
 	if($params['type'] == NOTIFY_MAIL) {
 
@@ -60,10 +57,16 @@ function notification($params) {
 			);
 		}
 
+		$possess_desc = str_replace('<!item_type!>',item_post_type($p[0]),$possess_desc);
+
+		// "a post"
 		$dest_str = sprintf($possess_desc,'a');
+
+		// "George Bull's post"
 		if($p)
 			$dest_str = sprintf($possess_desc,sprintf( t("%s's"),$p[0]['author-name']));
 		
+		// "your post"
 		if($p[0]['owner-name'] == $p[0]['author-name'] && $p[0]['wall'])
 			$dest_str = sprintf($possess_desc, t('your') );
 
-- 
cgit v1.2.3