aboutsummaryrefslogtreecommitdiffstats
path: root/include/conversation.php
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-06-20 19:08:40 -0700
committerFriendika <info@friendika.com>2011-06-20 19:08:40 -0700
commit55112cfdd0dc63c8ad7f719aea5b46db37fcf081 (patch)
treebdd28ad235fdc20dc2b711c77d14c2f53f0a3868 /include/conversation.php
parentdb336929cd1211e6704914c77dc332d7555decff (diff)
downloadvolse-hubzilla-55112cfdd0dc63c8ad7f719aea5b46db37fcf081.tar.gz
volse-hubzilla-55112cfdd0dc63c8ad7f719aea5b46db37fcf081.tar.bz2
volse-hubzilla-55112cfdd0dc63c8ad7f719aea5b46db37fcf081.zip
item source
Diffstat (limited to 'include/conversation.php')
-rw-r--r--include/conversation.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/conversation.php b/include/conversation.php
index b536fed5f..1fd9c31ec 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -191,7 +191,7 @@ function conversation(&$a, $items, $mode, $update) {
'$thumb' => $profile_avatar,
'$title' => $item['title'],
'$body' => $body,
- '$ago' => relative_date($item['created']),
+ '$ago' => (($item['app']) ? sprintf( t('%s from %s'),relative_date($item['created']),$item['app']) : relative_date($item['created'])),
'$location' => $location,
'$indent' => '',
'$owner_url' => $owner_url,
@@ -464,7 +464,7 @@ function conversation(&$a, $items, $mode, $update) {
'$sparkle' => $sparkle,
'$title' => $item['title'],
'$body' => $body,
- '$ago' => relative_date($item['created']),
+ '$ago' => (($item['app']) ? sprintf( t('%s from %s'),relative_date($item['created']),$item['app']) : relative_date($item['created'])),
'$lock' => $lock,
'$location' => $location,
'$indent' => $indent,