aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Lib/Enotify.php
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2020-03-12 17:55:35 -0700
committerzotlabs <mike@macgirvin.com>2020-03-12 17:55:35 -0700
commit8f5cb0c45a4aa2011933087f86333c60a77c3e0f (patch)
treeb9c99fd39711509f7d2e2a459414d819622ac68d /Zotlabs/Lib/Enotify.php
parent938d26ba3e9c6566d00f7393daa3e1b36f2e5479 (diff)
parent720d3dcedc96c7aaf6c4444c8b45acd46b8718b0 (diff)
downloadvolse-hubzilla-8f5cb0c45a4aa2011933087f86333c60a77c3e0f.tar.gz
volse-hubzilla-8f5cb0c45a4aa2011933087f86333c60a77c3e0f.tar.bz2
volse-hubzilla-8f5cb0c45a4aa2011933087f86333c60a77c3e0f.zip
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
Diffstat (limited to 'Zotlabs/Lib/Enotify.php')
-rw-r--r--Zotlabs/Lib/Enotify.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/Zotlabs/Lib/Enotify.php b/Zotlabs/Lib/Enotify.php
index f6f8ad0cb..85e90d67c 100644
--- a/Zotlabs/Lib/Enotify.php
+++ b/Zotlabs/Lib/Enotify.php
@@ -810,8 +810,9 @@ class Enotify {
}
else {
$itemem_text = (($item['item_thread_top'])
- ? t('created a new post')
- : sprintf( t('commented on %s\'s post'), '[bdi]' . $item['owner']['xchan_name'] . '[/bdi]'));
+ ? (($item['obj_type'] === 'Question') ? t('created a new poll') : t('created a new post'))
+ : (($item['obj_type'] === 'Answer') ? sprintf( t('voted on %s\'s poll'), '[bdi]' . $item['owner']['xchan_name'] . '[/bdi]') : sprintf( t('commented on %s\'s post'), '[bdi]' . $item['owner']['xchan_name'] . '[/bdi]'))
+ );
if($item['verb'] === ACTIVITY_SHARE) {
$itemem_text = sprintf( t('repeated %s\'s post'), '[bdi]' . $item['author']['xchan_name'] . '[/bdi]');