Merge pull request #1209 from FX7/master
Added exact time to items after 24 hours
This commit is contained in:
commit
f1697d3e5d
1 changed files with 6 additions and 1 deletions
|
@ -282,6 +282,11 @@ function relative_date($posted_date,$format = null) {
|
||||||
return t('less than a second ago');
|
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')),
|
$a = array( 12 * 30 * 24 * 60 * 60 => array( t('year'), t('years')),
|
||||||
30 * 24 * 60 * 60 => array( t('month'), t('months')),
|
30 * 24 * 60 * 60 => array( t('month'), t('months')),
|
||||||
7 * 24 * 60 * 60 => array( t('week'), t('weeks')),
|
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
|
// translators - e.g. 22 hours ago, 1 minute ago
|
||||||
if(! $format)
|
if(! $format)
|
||||||
$format = t('%1$d %2$s ago');
|
$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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}}
|
}}
|
||||||
|
|
Loading…
Reference in a new issue