diff options
| author | Michael <icarus@dabo.de> | 2012-02-19 20:09:42 +0100 |
|---|---|---|
| committer | Michael <icarus@dabo.de> | 2012-02-19 20:09:42 +0100 |
| commit | cafd4003522a472d2709569ea5eb5f80b817af23 (patch) | |
| tree | bbd512126515afc929de06dce79ba847b9681092 /include/datetime.php | |
| parent | 73e0e4d78341cb96ef9665a0ee4fb7e7ee2a701f (diff) | |
| parent | a9ed5915cebcf51347acaad51d0c252e57bceaff (diff) | |
| download | volse-hubzilla-cafd4003522a472d2709569ea5eb5f80b817af23.tar.gz volse-hubzilla-cafd4003522a472d2709569ea5eb5f80b817af23.tar.bz2 volse-hubzilla-cafd4003522a472d2709569ea5eb5f80b817af23.zip | |
Merge remote branch 'upstream/master'
Conflicts:
view/theme/vier/style.css
Diffstat (limited to 'include/datetime.php')
| -rwxr-xr-x | include/datetime.php | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/include/datetime.php b/include/datetime.php index d44e995cf..6d395fe3f 100755 --- a/include/datetime.php +++ b/include/datetime.php @@ -260,10 +260,11 @@ function relative_date($posted_date) { ); foreach ($a as $secs => $str) { - $d = $etime / $secs; - if ($d >= 1) { - $r = round($d); - return $r . ' ' . (($r == 1) ? $str[0] : $str[1]) . t(' ago'); + $d = $etime / $secs; + if ($d >= 1) { + $r = round($d); + // translators - e.g. 22 hours ago, 1 minute ago + return sprintf( t('%1$d %2$s ago'),$r, (($r == 1) ? $str[0] : $str[1])); } } }} |