Improved "lg" function

netcore · Feb 17, 2018 · f45ab53 · f45ab53
1 parent 05789e0
commit f45ab53
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/src/Helpers/Global.php b/src/Helpers/Global.php
@@ -41,20 +41,23 @@ function trans_model($row, Language $language, $attribute = null): String
      * @param $value
      * @return String
      */
-    function lg($key, array $replace = [], $locale = null, $value = null): String
+    function lg($key, $replace = [], $locale = null, $value = null): String
     {
         $createTranslations = config('translations.create_translations_on_the_fly', false);
-
         if ($createTranslations) {
+
             $translations = cache('translations');
             $languages = languages();
-            if (isset($locale) && !$languages->where('iso_code', $locale)) {
+            if (isset($locale) && !$languages->where('iso_code', $locale)->count()) {
                 $value = $locale;
             }
+            if(!$locale && !$value && !is_array($replace)) {
+                $value = $replace;
+            }
             $fallbackIsoCode = $languages->where('is_fallback', 1)->first()->iso_code;
             $transKey = $fallbackIsoCode . '.' . $key;
 
-            if (!isset($translations[$transKey]) && isset($value)) {
+            if (!isset($translations[$transKey])) {
                 $translations = [
                     'key' => $key,
                 ];
@@ -70,6 +73,10 @@ function lg($key, array $replace = [], $locale = null, $value = null): String
             }
         }
 
+        if(!is_array($replace)) {
+            $replace = [];
+        }
+
         return trans($key, $replace, $locale);
     }
 }