diff options
author | Mario Vavti <mario@mariovavti.com> | 2017-11-04 10:11:48 +0100 |
---|---|---|
committer | Mario Vavti <mario@mariovavti.com> | 2017-11-04 10:11:48 +0100 |
commit | 9dfb471c0bbf2978e528689f6c0885ff9abddc7d (patch) | |
tree | 026b4eb97df9dfa0516c46c72e9b70d19e32529c /include | |
parent | a899ce1c22386b9ff882048cba35d46f560ee654 (diff) | |
parent | 9abb061e7185a29cb85ebbad04deba715e1a6a06 (diff) | |
download | volse-hubzilla-9dfb471c0bbf2978e528689f6c0885ff9abddc7d.tar.gz volse-hubzilla-9dfb471c0bbf2978e528689f6c0885ff9abddc7d.tar.bz2 volse-hubzilla-9dfb471c0bbf2978e528689f6c0885ff9abddc7d.zip |
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'include')
-rw-r--r-- | include/conversation.php | 12 |
1 files changed, 12 insertions, 0 deletions
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]'; |