diff --git a/application/admin/lang/zh-cn.php b/application/admin/lang/zh-cn.php index 2d537adb1af01af09b18b61fa011bb399cc97a4b..90fd68b398826015fa76bdfd6531a1f15c210190 100755 --- a/application/admin/lang/zh-cn.php +++ b/application/admin/lang/zh-cn.php @@ -1,5 +1,4 @@ '会员ID', 'Username' => '用户名', @@ -108,12 +107,20 @@ return [ 'Search %s' => '搜索 %s', 'View %s' => '查看 %s', '%d second%s ago' => '%d秒前', + '%d second%s ago' => '%d秒前', '%d minute%s ago' => '%d分钟前', '%d hour%s ago' => '%d小时前', '%d day%s ago' => '%d天前', '%d week%s ago' => '%d周前', '%d month%s ago' => '%d月前', '%d year%s ago' => '%d年前', + '%d second%s after' => '%d秒后', + '%d minute%s after' => '%d分钟后', + '%d hour%s after' => '%d小时后', + '%d day%s after' => '%d天后', + '%d week%s after' => '%d周后', + '%d month%s after' => '%d月后', + '%d year%s after' => '%d年后', 'Set to normal' => '设为正常', 'Set to hidden' => '设为隐藏', 'Recycle bin' => '回收站', diff --git a/extend/fast/Date.php b/extend/fast/Date.php index c4e4c31260c66c9fd79b98045ff6bf10aedd4867..c5770b6b963590b6cf43c99c66f47d6256216733 100644 --- a/extend/fast/Date.php +++ b/extend/fast/Date.php @@ -125,6 +125,7 @@ class Date public static function human($remote, $local = null) { $timediff = (is_null($local) || $local ? time() : $local) - $remote; + $tense = $timediff < 0 ? 'after' : 'ago'; $chunks = array( array(60 * 60 * 24 * 365, 'year'), array(60 * 60 * 24 * 30, 'month'), @@ -135,6 +136,8 @@ class Date array(1, 'second') ); + $name = 'second'; + $count = 0; for ($i = 0, $j = count($chunks); $i < $j; $i++) { $seconds = $chunks[$i][0]; $name = $chunks[$i][1]; @@ -142,7 +145,7 @@ class Date break; } } - return __("%d {$name}%s ago", $count, ($count > 1 ? 's' : '')); + return __("%d $name%s $tense", $count, ($count > 1 ? 's' : '')); } /**