Browse Source

!481 修复本地时间参数无效、修复 __ 函数的参数传递错误
Merge pull request !481 from 一半/develop

Karson 3 months ago
parent
commit
9bdf43e808
1 changed files with 2 additions and 2 deletions
  1. 2 2
      extend/fast/Date.php

+ 2 - 2
extend/fast/Date.php

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