provide short localised summary for likes that will end up in displayed notifications

2 files changed, 17 insertions, 1 deletions

diff --git a/Zotlabs/Lib/Enotify.php b/Zotlabs/Lib/Enotify.php
index e82c11a35..d5798e671 100644
--- a/Zotlabs/Lib/Enotify.php
+++ b/Zotlabs/Lib/Enotify.php
@@ -778,10 +778,14 @@ class Enotify {
 
 		// Call localize_item to get a one line status for activities. 
 		// This should set $item['localized'] to indicate we have a brief summary.
+		// and perhaps $item['shortlocalized'] for an even briefer summary
 
 		localize_item($item);
 
-		if($item['localize']) {
+		if($item['shortlocalize']) {
+			$itemem_text = $item['shortlocalize'];
+		}
+		elseif($item['localize']) {
 			$itemem_text = $item['localize'];
 		}
 		else {
diff --git a/include/conversation.php b/include/conversation.php
index f395b2cbe..5ff8b3864 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -162,6 +162,18 @@ function localize_item(&$item){
 			elseif(activity_match($item['verb'],ACTIVITY_DISLIKE)) {
 				$bodyverb = t('%1$s doesn\'t like %2$s\'s %3$s');
 			}
+
+			// short version, in notification strings the author will be displayed separately
+
+			if(activity_match($item['verb'],ACTIVITY_LIKE)) {
+				$shortbodyverb = t('likes %1$s\'s %2$s');
+			}
+			elseif(activity_match($item['verb'],ACTIVITY_DISLIKE)) {
+				$shortbodyverb = t('doesn\'t like %1$s\'s %2$s');
+			}
+
+			$item['shortlocalize'] = sprintf($bodyverb, $objauthor, $plink);
+
 			$item['body'] = $item['localize'] = sprintf($bodyverb, $author, $objauthor, $plink);
 			if($Bphoto != "") 
 				$item['body'] .= "\n\n\n" . '[zrl=' . chanlink_url($author_link) . '][zmg=80x80]' . $Bphoto . '[/zmg][/zrl]';