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

Pre Merge pull request !203 from 寂静心欢喜/f

pull/203/MERGE
寂静心欢喜 2020-05-26 23:26:57 +08:00 committed by Gitee
parent d3a1c3978e f7728acefe
commit 3cce5191bc
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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' => '回收站',

6
extend/fast/Date.php
View File

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