Supports multi-country locales on Translatable

area17 · Jul 20, 2021 · c5b341d · c5b341d
1 parent 5d9c995
commit c5b341d
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/src/Helpers/helpers.php b/src/Helpers/helpers.php
@@ -262,15 +262,3 @@ function capsules($capsule = null) {
         return $manager;
     }
 }
-
-if (!function_exists('twill_locales')) {
-    function twill_locales() {
-        return $allLanguages = collect(config('translatable.locales'))->map(function ($locale, $index) {
-            return collect($locale)->map(function ($country) use ($locale, $index) {
-                return is_numeric($index)
-                    ? $locale
-                    : "$index-$country";
-            });
-        })->flatten()->toArray();
-    }
-}
diff --git a/src/Helpers/i18n_helpers.php b/src/Helpers/i18n_helpers.php
@@ -16,7 +16,19 @@ function twillTrans($key, $replace = [])
      */
     function getLocales()
     {
-        return twill_locales() ?? [config('app.locale')];
+        $locales = collect(config('translatable.locales'))->map(function ($locale, $index) {
+            return collect($locale)->map(function ($country) use ($locale, $index) {
+                return is_numeric($index)
+                    ? $locale
+                    : "$index-$country";
+            });
+        })->flatten()->toArray();
+
+        if (blank($locales)) {
+            $locales = [config('app.locale')];
+        }
+
+        return $locales;
     }
 }
 
@@ -30,7 +42,7 @@ function getLanguagesForVueStore($form_fields = [], $translate = true)
     {
         $manageMultipleLanguages = count(getLocales()) > 1;
         if ($manageMultipleLanguages && $translate) {
-            $allLanguages = Collection::make(twill_locales())->map(function ($locale, $index) use ($form_fields) {
+            $allLanguages = Collection::make(getLocales())->map(function ($locale, $index) use ($form_fields) {
                 return [
                     'shortlabel' => strtoupper($locale),
                     'label' => getLanguageLabelFromLocaleCode($locale),

diff --git a/src/Http/Controllers/Admin/ModuleController.php b/src/Http/Controllers/Admin/ModuleController.php
@@ -1159,7 +1159,7 @@ protected function getIndexTableColumns($items)
                 'html' => $column['html'] ?? false,
             ]);
         }
-        if ($this->moduleHas('translations') && count(twill_locales()) > 1) {
+        if ($this->moduleHas('translations') && count(getLocales()) > 1) {
             array_push($tableColumns, [
                 'name' => 'languages',
                 'label' => twillTrans('twill::lang.listing.languages'),

diff --git a/src/Models/Behaviors/HasTranslation.php b/src/Models/Behaviors/HasTranslation.php
@@ -138,7 +138,7 @@ public function getActiveLanguages()
                 'published' => $translation->active ?? false,
             ];
         })->sortBy(function ($translation) {
-            $localesOrdered = twill_locales();
+            $localesOrdered = getLocales();
             return array_search($translation['value'], $localesOrdered);
         })->values();
     }