Merge pull request #19 from Laravel-Lang/1.x

Improved localization coverage for CLDR
Laravel-Lang · Nov 11, 2023 · c7ed1ef · c7ed1ef
2 parents 873d960 + 817940f
commit c7ed1ef
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml
@@ -51,9 +51,9 @@ jobs:
                 run: |
                     IS_DIRTY=1
 
-                    vendor/bin/lang sync
                     sudo php ./bin/native translate
                     sudo php ./bin/native collect
+                    vendor/bin/lang sync
 
                     { git add . && git commit -a -m "🔑 Synchronization of translation keys"; } || IS_DIRTY=0
 

diff --git a/app/Processors/Cldr.php b/app/Processors/Cldr.php
@@ -17,6 +17,7 @@
 
 namespace LaravelLang\Dev\Processors;
 
+use Illuminate\Support\Str;
 use LaravelLang\Dev\Services\Process;
 
 class Cldr extends Processor
@@ -37,6 +38,13 @@ protected function toInstall(): string
     {
         return collect(parent::locales())
             ->filter(fn (string $locale) => ! in_array($locale, $this->notSupported, true))
+            ->map(fn (string $locale) => [
+                $locale,
+                Str::before($locale, '_'),
+            ])
+            ->flatten()
+            ->unique()
+            ->sort()
             ->map(fn (string $locale) => '+' . $locale)
             ->implode(',');
     }