diff options
| author | friendica <info@friendica.com> | 2014-05-28 17:58:49 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-05-28 17:58:49 -0700 |
| commit | 30eb1b494a403acf0bcad461907ece77c707d574 (patch) | |
| tree | 9d4c099d38e67bdea4948dacabbe104ed1c98498 | |
| parent | f6de9c09fb34ed9eba9210e08097e1aecfaa5dad (diff) | |
| download | volse-hubzilla-30eb1b494a403acf0bcad461907ece77c707d574.tar.gz volse-hubzilla-30eb1b494a403acf0bcad461907ece77c707d574.tar.bz2 volse-hubzilla-30eb1b494a403acf0bcad461907ece77c707d574.zip | |
moods: simplify 'xyz is tired' rather than 'xyz is currently tired'. This is possible now that we have translation contexts, as before '$1 is $2' was ambiguous without a context - in this case 'mood'.
| -rw-r--r-- | include/conversation.php | 2 | ||||
| -rwxr-xr-x | mod/mood.php | 9 | ||||
| -rw-r--r-- | version.inc | 2 |
3 files changed, 3 insertions, 10 deletions
diff --git a/include/conversation.php b/include/conversation.php index 2d72f3489..21ce3bb66 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -255,7 +255,7 @@ function localize_item(&$item){ $A = '[zrl=' . chanlink_url($Alink) . ']' . $Aname . '[/zrl]'; - $txt = t('%1$s is currently %2$s'); + $txt = t('%1$s is %2$s','mood'); $item['body'] = sprintf($txt, $A, t($verb)); } diff --git a/mod/mood.php b/mod/mood.php index 5075f622d..5508fcb5a 100755 --- a/mod/mood.php +++ b/mod/mood.php @@ -60,7 +60,7 @@ function mood_init(&$a) { $mid = item_message_id(); - $action = sprintf( t('%1$s is currently %2$s'), '[zrl=' . $poster['xchan_url'] . ']' . $poster['xchan_name'] . '[/zrl]' , $verbs[$verb]); + $action = sprintf( t('%1$s is %2$s','mood'), '[zrl=' . $poster['xchan_url'] . ']' . $poster['xchan_name'] . '[/zrl]' , $verbs[$verb]); $item_flags = ITEM_WALL|ITEM_ORIGIN|ITEM_UNSEEN; if(! $parent_mid) $item_flags |= ITEM_THREAD_TOP; @@ -93,14 +93,7 @@ function mood_init(&$a) { $item_id = $post['item_id']; if($item_id) { -// q("UPDATE `item` SET `plink` = '%s' WHERE `uid` = %d AND `id` = %d LIMIT 1", -// dbesc($a->get_baseurl() . '/display/' . $poster['nickname'] . '/' . $item_id), -// intval($uid), -// intval($item_id) -// ); - proc_run('php',"include/notifier.php","activity", $item_id); - } call_hooks('post_local_end', $arr); diff --git a/version.inc b/version.inc index eb11b4158..f0552de10 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-05-27.688 +2014-05-28.689 |