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

!481 修复本地时间参数无效、修复 __ 函数的参数传递错误 

Merge pull request !481 from 一半/develop
pull/491/head
Karson 2025-01-03 03:02:38 +00:00 committed by Gitee
parent 17931decd5 8fe9f5954c
commit 9bdf43e808
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
extend/fast/Date.php
View File

@ -124,7 +124,7 @@ class Date
*/
public static function human($remote, $local = null)
{
$time_diff = (is_null($local) || $local ? time() : $local) - $remote;
$time_diff = (is_null($local) ? time() : $local) - $remote;
$tense = $time_diff < 0 ? 'after' : 'ago';
$time_diff = abs($time_diff);
$chunks = [
@ -146,7 +146,7 @@ class Date
break;
}
}
return __("%d $name%s $tense", $count, ($count > 1 ? 's' : ''));
return __("%d $name%s $tense", [$count, ($count > 1 ? 's' : '')]);
}
/**