i18n fixes, logic cleanup, wording clarifications, and more from nbachiyski. fixes #3474

git-svn-id: https://develop.svn.wordpress.org/trunk@4658 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Mark Jaquith
2006-12-21 23:06:18 +00:00
parent a011b23b47
commit f95b191dab
17 changed files with 62 additions and 70 deletions

View File

@@ -738,22 +738,22 @@ function human_time_diff( $from, $to = '' ) {
$diff = (int) abs($to - $from);
if ($diff <= 3600) {
$mins = round($diff / 60);
if ($mins <= 1)
$since = __('1 min');
else
$since = sprintf( __('%s mins'), $mins);
if ($mins <= 1) {
$mins = 1;
}
$since = sprintf(__ngettext('%s min', '%s mins', $mins), $mins);
} else if (($diff <= 86400) && ($diff > 3600)) {
$hours = round($diff / 3600);
if ($hours <= 1)
$since = __('1 hour');
else
$since = sprintf( __('%s hours'), $hours );
if ($hours <= 1) {
$hour = 1;
}
$since = sprintf(__ngettext('%s hour', '%s hours', $hours), $hours);
} elseif ($diff >= 86400) {
$days = round($diff / 86400);
if ($days <= 1)
$since = __('1 day');
else
$since = sprintf( __('%s days'), $days );
if ($days <= 1) {
$days = 1;
}
$since = sprintf(__('%s day', '%s days', $days), $days);
}
return $since;
}