sync

Author: esyede

application/language/en/date.php application/language/en/carbon.php

@@ -5,10 +5,10 @@
 return [
     /*
     |--------------------------------------------------------------------------
-    | Date Language
+    | Carbon Language
     |--------------------------------------------------------------------------
     |
-    | Baris - baris bahasa brikut ini digunakan oleh library Date.
+    | Baris - baris bahasa brikut ini digunakan oleh library Carbon.
     |
     */
 

application/language/id/date.php application/language/id/carbon.php

@@ -5,10 +5,10 @@
 return [
     /*
     |--------------------------------------------------------------------------
-    | Date Language Lines
+    | Carbon Language Lines
     |--------------------------------------------------------------------------
     |
-    | Baris - baris bahasa brikut ini digunakan oleh library Date.
+    | Baris - baris bahasa brikut ini digunakan oleh library Carbon.
     |
     */
 

system/carbon.php

@@ -862,18 +862,18 @@ public function diffForHumans(Carbon $other = null, $absolute = false)
             $delta = floor($delta / $value);
         }
 
-        $delta = ($delta <= 0) ? 1 : $delta;
-        $str = $delta . ' ' . Lang::line('date.' . $unit . (($delta <= 1) ? '' : 's'))->get();
+        $delta = ($delta < 1) ? 1 : $delta;
+        $str = $delta . ' ' . Lang::line('carbon.' . $unit . (($delta <= 1) ? '' : 's'))->get();
 
         if ($absolute) {
             return $str;
         }
 
         if ($now) {
-            return $str . ' ' . Lang::line('date.' . ($future ? 'from_now' : 'ago'))->get();
+            return $str . ' ' . Lang::line('carbon.' . ($future ? 'from_now' : 'ago'))->get();
         }
 
-        return $str . ' ' . Lang::line('date.' . ($future ? 'after' : 'before'))->get();
+        return $str . ' ' . Lang::line('carbon.' . ($future ? 'after' : 'before'))->get();
    }
 
     public function startOfDay()

system/str.php

@@ -593,6 +593,8 @@ public static function ulid($lowercase = false)
      * @param int  $count
      * @param int  $max
      * @param bool $standard
+     *
+     * @return string
      */
     public static function lorem($count = 1, $max = 20, $standard = true)
     {