friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge eb5bf2a733 into 42306eab0b

This commit is contained in:
FX7 2014-10-25 14:52:27 +00:00
parent 42306eab0b eb5bf2a733
commit 9c1087389b
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/datetime.php
View File

@ -282,6 +282,11 @@ function relative_date($posted_date,$format = null) {
return t('less than a second ago');
}
$time_append = '';
if ($etime >= 86400) {
$time_append = ' ('.$localtime.')';
}
$a = array( 12 * 30 * 24 * 60 * 60 => array( t('year'), t('years')),
30 * 24 * 60 * 60 => array( t('month'), t('months')),
7 * 24 * 60 * 60 => array( t('week'), t('weeks')),
@ -298,7 +303,7 @@ function relative_date($posted_date,$format = null) {
// translators - e.g. 22 hours ago, 1 minute ago
if(! $format)
$format = t('%1$d %2$s ago');
return sprintf( $format,$r, (($r == 1) ? $str[0] : $str[1]));
return sprintf( $format,$r, (($r == 1) ? $str[0] : $str[1])).$time_append;
}
}
}}