mirror
/
fastadmin
mirror of https://gitee.com/karson/fastadmin.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Pre Merge pull request !200 from 寂静心欢喜/feature

pull/200/MERGE
寂静心欢喜 2020-05-23 17:33:08 +08:00 committed by Gitee
parent 241c6fc370 415bbfb121
commit d8eb73e5e0
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
application/admin/lang/zh-cn.php
View File

@ -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' => '未知参数',

5
extend/fast/Date.php
View File

@ -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' : ''));
}
/**