diff --git a/application/admin/lang/zh-cn.php b/application/admin/lang/zh-cn.php index 7c28b2bf992c70c232da70ce1b6b5de758f9edd6..2225deded576a6d5071ab82df71f3233e7973957 100755 --- a/application/admin/lang/zh-cn.php +++ b/application/admin/lang/zh-cn.php @@ -111,6 +111,15 @@ return [ '%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 8671476d5e117c9f2d7a648c54a82b6a6ab89ab2..6e82c535bea2749045fe26b8e95da5c5a7dd99a8 100644 --- a/extend/fast/Date.php +++ b/extend/fast/Date.php @@ -124,7 +124,9 @@ class Date */ public static function human($remote, $local = null) { - $timediff = (is_null($local) || $local ? time() : $local) - $remote; + $local = is_null($local) || $local ? time() : $local; + $type = ($remote > $local) ? 'after' : 'ago'; + $timediff = abs($local - $remote); $chunks = array( array(60 * 60 * 24 * 365, 'year'), array(60 * 60 * 24 * 30, 'month'), @@ -142,7 +144,7 @@ class Date break; } } - return __("%d {$name}%s ago", $count, ($count > 1 ? 's' : '')); + return __("%d {$name}%s {$type}", $count, ($count > 1 ? 's' : '')); } /**