diff --git a/application/admin/lang/zh-cn.php b/application/admin/lang/zh-cn.php index d9ad4c23ef64c11a4f906b256816a3eb00f41350..9aee9d6bf97b6c202b2dd7648d69411873f170a0 100644 --- a/application/admin/lang/zh-cn.php +++ b/application/admin/lang/zh-cn.php @@ -99,6 +99,14 @@ return [ '%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' => '设为隐藏', 'Invalid parameters' => '未知参数', diff --git a/extend/fast/Date.php b/extend/fast/Date.php index 8e84d0448100b2f152f9a2c78f987ecd733f217f..ed73e43fd5cdf1658837f9c0bd9ae22bb391a3d1 100644 --- a/extend/fast/Date.php +++ b/extend/fast/Date.php @@ -133,7 +133,8 @@ class Date */ public static function human($remote, $local = null) { - $timediff = (is_null($local) || $local ? time() : $local) - $remote; + $type = ($remote > $local) ? 'after' : 'ago'; + $timediff = abs((is_null($local) || $local ? time() : $local) - $remote); $chunks = array( array(60 * 60 * 24 * 365, 'year'), array(60 * 60 * 24 * 30, 'month'), @@ -153,7 +154,7 @@ class Date break; } } - return __("%d {$name}%s ago", $count, ($count > 1 ? 's' : '')); + return __("%d {$name}%s {$type}", $count, ($count > 1 ? 's' : '')); } /**