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

Fixed root package error
Laravel-Lang · Nov 10, 2023 · 4e5c30b · 4e5c30b
2 parents b87ed49 + e835c44
commit 4e5c30b
Show file tree

Hide file tree

Showing 89 changed files with 102 additions and 110 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -2,6 +2,7 @@
 
 .github/ export-ignore
 
+bin/ export-ignore
 tests/ export-ignore
 
 .editorconfig export-ignore

diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml
@@ -52,7 +52,7 @@ jobs:
                     IS_DIRTY=1
 
                     vendor/bin/lang sync
-                    php app/combined.php
+                    php bin/combined.php
 
                     { git add . && git commit -a -m "🔑 Synchronization of translation keys"; } || IS_DIRTY=0
 

diff --git a/app/combined.php → bin/combined.php b/app/combined.php → bin/combined.php
@@ -16,19 +16,20 @@
 declare(strict_types=1);
 
 use DragonCode\Support\Facades\Filesystem\File;
-use LaravelLang\Locales\Enums\Locale;
 use LaravelLang\NativeLocaleNames\Helpers\Arr;
 use LaravelLang\NativeLocaleNames\Native;
 
 require_once __DIR__ . '/../vendor/autoload.php';
 
 $result = [];
 
-foreach (Locale::values() as $locale) {
+$locales = Arr::file(__DIR__ . '/../source/locales.json');
+
+foreach (array_keys($locales) as $locale) {
     $result[$locale] = Native::get($locale)[$locale];
 }
 
 File::store(
-    __DIR__ . '/../locales/_combined/php.json',
+    __DIR__ . '/../locales/_combined/json.json',
     json_encode(Arr::ksort($result), JSON_UNESCAPED_UNICODE ^ JSON_UNESCAPED_SLASHES ^ JSON_PRETTY_PRINT)
 );
diff --git a/composer.json b/composer.json
@@ -31,10 +31,10 @@
     "require": {
         "php": "^8.1",
         "ext-json": "*",
-        "dragon-code/support": "^6.11",
-        "laravel-lang/locales": "^1.0"
+        "dragon-code/support": "^6.11"
     },
     "require-dev": {
+        "laravel-lang/locales": "^1.6",
         "laravel-lang/status-generator": "^2.3.1",
         "pestphp/pest": "^2.24.3",
         "symfony/var-dumper": "^6.3"

diff --git a/locales/_combined/php.json → locales/_combined/json.json b/locales/_combined/php.json → locales/_combined/json.json
@@ -78,4 +78,4 @@
     "zh_CN": "简体中文）",
     "zh_HK": "中文（香港）",
     "zh_TW": "中文（台灣）"
-}
+}
diff --git a/locales/af/php.json → locales/af/json.json b/locales/af/php.json → locales/af/json.json
diff --git a/locales/ar/php.json → locales/ar/json.json b/locales/ar/php.json → locales/ar/json.json
diff --git a/locales/az/php.json → locales/az/json.json b/locales/az/php.json → locales/az/json.json
diff --git a/locales/be/php.json → locales/be/json.json b/locales/be/php.json → locales/be/json.json
diff --git a/locales/bg/php.json → locales/bg/json.json b/locales/bg/php.json → locales/bg/json.json
diff --git a/locales/bn/php.json → locales/bn/json.json b/locales/bn/php.json → locales/bn/json.json
diff --git a/locales/bs/php.json → locales/bs/json.json b/locales/bs/php.json → locales/bs/json.json
diff --git a/locales/ca/php.json → locales/ca/json.json b/locales/ca/php.json → locales/ca/json.json
diff --git a/locales/cs/php.json → locales/cs/json.json b/locales/cs/php.json → locales/cs/json.json
diff --git a/locales/cy/php.json → locales/cy/json.json b/locales/cy/php.json → locales/cy/json.json
diff --git a/locales/da/php.json → locales/da/json.json b/locales/da/php.json → locales/da/json.json
diff --git a/locales/de/php.json → locales/de/json.json b/locales/de/php.json → locales/de/json.json
diff --git a/locales/de_CH/php.json → locales/de_CH/json.json b/locales/de_CH/php.json → locales/de_CH/json.json
diff --git a/locales/el/php.json → locales/el/json.json b/locales/el/php.json → locales/el/json.json
diff --git a/locales/en/php.json → locales/en/json.json b/locales/en/php.json → locales/en/json.json
diff --git a/locales/es/php.json → locales/es/json.json b/locales/es/php.json → locales/es/json.json
diff --git a/locales/et/php.json → locales/et/json.json b/locales/et/php.json → locales/et/json.json
diff --git a/locales/eu/php.json → locales/eu/json.json b/locales/eu/php.json → locales/eu/json.json
diff --git a/locales/fa/php.json → locales/fa/json.json b/locales/fa/php.json → locales/fa/json.json
diff --git a/locales/fi/php.json → locales/fi/json.json b/locales/fi/php.json → locales/fi/json.json
diff --git a/locales/fil/php.json → locales/fil/json.json b/locales/fil/php.json → locales/fil/json.json
diff --git a/locales/fr/php.json → locales/fr/json.json b/locales/fr/php.json → locales/fr/json.json
diff --git a/locales/gl/php.json → locales/gl/json.json b/locales/gl/php.json → locales/gl/json.json
diff --git a/locales/gu/php.json → locales/gu/json.json b/locales/gu/php.json → locales/gu/json.json
diff --git a/locales/he/php.json → locales/he/json.json b/locales/he/php.json → locales/he/json.json
diff --git a/locales/hi/php.json → locales/hi/json.json b/locales/hi/php.json → locales/hi/json.json
diff --git a/locales/hr/php.json → locales/hr/json.json b/locales/hr/php.json → locales/hr/json.json
diff --git a/locales/hu/php.json → locales/hu/json.json b/locales/hu/php.json → locales/hu/json.json
diff --git a/locales/hy/php.json → locales/hy/json.json b/locales/hy/php.json → locales/hy/json.json
diff --git a/locales/id/php.json → locales/id/json.json b/locales/id/php.json → locales/id/json.json
diff --git a/locales/is/php.json → locales/is/json.json b/locales/is/php.json → locales/is/json.json
diff --git a/locales/it/php.json → locales/it/json.json b/locales/it/php.json → locales/it/json.json
diff --git a/locales/ja/php.json → locales/ja/json.json b/locales/ja/php.json → locales/ja/json.json
diff --git a/locales/ka/php.json → locales/ka/json.json b/locales/ka/php.json → locales/ka/json.json
diff --git a/locales/kk/php.json → locales/kk/json.json b/locales/kk/php.json → locales/kk/json.json
diff --git a/locales/km/php.json → locales/km/json.json b/locales/km/php.json → locales/km/json.json
diff --git a/locales/kn/php.json → locales/kn/json.json b/locales/kn/php.json → locales/kn/json.json
diff --git a/locales/ko/php.json → locales/ko/json.json b/locales/ko/php.json → locales/ko/json.json
diff --git a/locales/lt/php.json → locales/lt/json.json b/locales/lt/php.json → locales/lt/json.json
diff --git a/locales/lv/php.json → locales/lv/json.json b/locales/lv/php.json → locales/lv/json.json
diff --git a/locales/mk/php.json → locales/mk/json.json b/locales/mk/php.json → locales/mk/json.json
diff --git a/locales/mn/php.json → locales/mn/json.json b/locales/mn/php.json → locales/mn/json.json
diff --git a/locales/mr/php.json → locales/mr/json.json b/locales/mr/php.json → locales/mr/json.json
diff --git a/locales/ms/php.json → locales/ms/json.json b/locales/ms/php.json → locales/ms/json.json
diff --git a/locales/nb/php.json → locales/nb/json.json b/locales/nb/php.json → locales/nb/json.json
diff --git a/locales/ne/php.json → locales/ne/json.json b/locales/ne/php.json → locales/ne/json.json
diff --git a/locales/nl/php.json → locales/nl/json.json b/locales/nl/php.json → locales/nl/json.json
diff --git a/locales/nn/php.json → locales/nn/json.json b/locales/nn/php.json → locales/nn/json.json
diff --git a/locales/oc/php.json → locales/oc/json.json b/locales/oc/php.json → locales/oc/json.json
diff --git a/locales/pl/php.json → locales/pl/json.json b/locales/pl/php.json → locales/pl/json.json
diff --git a/locales/ps/php.json → locales/ps/json.json b/locales/ps/php.json → locales/ps/json.json
diff --git a/locales/pt/php.json → locales/pt/json.json b/locales/pt/php.json → locales/pt/json.json
diff --git a/locales/pt_BR/php.json → locales/pt_BR/json.json b/locales/pt_BR/php.json → locales/pt_BR/json.json
diff --git a/locales/ro/php.json → locales/ro/json.json b/locales/ro/php.json → locales/ro/json.json
diff --git a/locales/ru/php.json → locales/ru/json.json b/locales/ru/php.json → locales/ru/json.json
diff --git a/locales/sc/php.json → locales/sc/json.json b/locales/sc/php.json → locales/sc/json.json
diff --git a/locales/si/php.json → locales/si/json.json b/locales/si/php.json → locales/si/json.json
diff --git a/locales/sk/php.json → locales/sk/json.json b/locales/sk/php.json → locales/sk/json.json
diff --git a/locales/sl/php.json → locales/sl/json.json b/locales/sl/php.json → locales/sl/json.json
diff --git a/locales/sq/php.json → locales/sq/json.json b/locales/sq/php.json → locales/sq/json.json
diff --git a/locales/sr_Cyrl/php.json → locales/sr_Cyrl/json.json b/locales/sr_Cyrl/php.json → locales/sr_Cyrl/json.json
diff --git a/locales/sr_Latn/php.json → locales/sr_Latn/json.json b/locales/sr_Latn/php.json → locales/sr_Latn/json.json
diff --git a/locales/sr_Latn_ME/php.json → locales/sr_Latn_ME/json.json b/locales/sr_Latn_ME/php.json → locales/sr_Latn_ME/json.json
diff --git a/locales/sv/php.json → locales/sv/json.json b/locales/sv/php.json → locales/sv/json.json
diff --git a/locales/sw/php.json → locales/sw/json.json b/locales/sw/php.json → locales/sw/json.json
diff --git a/locales/tg/php.json → locales/tg/json.json b/locales/tg/php.json → locales/tg/json.json
diff --git a/locales/th/php.json → locales/th/json.json b/locales/th/php.json → locales/th/json.json
diff --git a/locales/tk/php.json → locales/tk/json.json b/locales/tk/php.json → locales/tk/json.json
diff --git a/locales/tl/php.json → locales/tl/json.json b/locales/tl/php.json → locales/tl/json.json
diff --git a/locales/tr/php.json → locales/tr/json.json b/locales/tr/php.json → locales/tr/json.json
diff --git a/locales/ug/php.json → locales/ug/json.json b/locales/ug/php.json → locales/ug/json.json
diff --git a/locales/uk/php.json → locales/uk/json.json b/locales/uk/php.json → locales/uk/json.json
diff --git a/locales/ur/php.json → locales/ur/json.json b/locales/ur/php.json → locales/ur/json.json
diff --git a/locales/uz_Cyrl/php.json → locales/uz_Cyrl/json.json b/locales/uz_Cyrl/php.json → locales/uz_Cyrl/json.json
diff --git a/locales/uz_Latn/php.json → locales/uz_Latn/json.json b/locales/uz_Latn/php.json → locales/uz_Latn/json.json
diff --git a/locales/vi/php.json → locales/vi/json.json b/locales/vi/php.json → locales/vi/json.json
diff --git a/locales/zh_CN/php.json → locales/zh_CN/json.json b/locales/zh_CN/php.json → locales/zh_CN/json.json
diff --git a/locales/zh_HK/php.json → locales/zh_HK/json.json b/locales/zh_HK/php.json → locales/zh_HK/json.json
diff --git a/locales/zh_TW/php.json → locales/zh_TW/json.json b/locales/zh_TW/php.json → locales/zh_TW/json.json
diff --git a/source/locales.json b/source/locales.json
@@ -0,0 +1,81 @@
+{
+    "af": "Afrikaans",
+    "ar": "Arabic",
+    "az": "Azerbaijani (Latin)",
+    "be": "Belarusian",
+    "bg": "Bulgarian",
+    "bn": "Bengali",
+    "bs": "Bosnian",
+    "ca": "Catalan",
+    "cs": "Czech",
+    "cy": "Welsh",
+    "da": "Danish",
+    "de": "German",
+    "de_CH": "Swiss High German",
+    "el": "Greek",
+    "en": "English",
+    "es": "Spanish",
+    "et": "Estonian",
+    "eu": "Basque",
+    "fa": "Persian",
+    "fi": "Finnish",
+    "fil": "Filipino",
+    "fr": "French",
+    "gl": "Galician",
+    "gu": "Gujarati",
+    "he": "Hebrew",
+    "hi": "Hindi",
+    "hr": "Croatian",
+    "hu": "Hungarian",
+    "hy": "Armenian",
+    "id": "Indonesian",
+    "is": "Icelandic",
+    "it": "Italian",
+    "ja": "Japanese",
+    "ka": "Georgian",
+    "kk": "Kazakh",
+    "km": "Khmer",
+    "kn": "Kannada",
+    "ko": "Korean",
+    "lt": "Lithuanian",
+    "lv": "Latvian",
+    "mk": "Macedonian",
+    "mn": "Mongolian",
+    "mr": "Marathi",
+    "ms": "Malay",
+    "nb": "Norwegian Bokmål",
+    "ne": "Nepali",
+    "nl": "Dutch",
+    "nn": "Norwegian Nynorsk",
+    "oc": "Occitan",
+    "pl": "Polish",
+    "ps": "Pashto",
+    "pt": "Portuguese",
+    "pt_BR": "Brazilian Portuguese",
+    "ro": "Romanian",
+    "ru": "Russian",
+    "sc": "Sardinian",
+    "si": "Sinhala",
+    "sk": "Slovak",
+    "sl": "Slovene",
+    "sq": "Albanian",
+    "sr_Cyrl": "Serbian (Cyrillic)",
+    "sr_Latn": "Serbian (Latin)",
+    "sr_Latn_ME": "Serbian (Montenegro)",
+    "sv": "Swedish",
+    "sw": "Swahili",
+    "tg": "Tajik (Cyrillic)",
+    "th": "Thai",
+    "tk": "Turkmen",
+    "tl": "Tagalog",
+    "tr": "Turkish",
+    "ug": "Uyghur",
+    "uk": "Ukrainian",
+    "ur": "Urdu",
+    "uz_Cyrl": "Uzbek (Cyrillic)",
+    "uz_Latn": "Uzbek (Latin)",
+    "vi": "Vietnamese",
+    "zh_CN": "Chinese (Simplified)",
+    "zh_HK": "Chinese (Hong Kong)",
+    "zh_TW": "Chinese (Taiwan)"
+}
diff --git a/source/locales.php b/source/locales.php
diff --git a/src/Helpers/Path.php b/src/Helpers/Path.php
@@ -21,6 +21,11 @@ class Path
 {
     public static function resolve(string $locale): bool|string
     {
-        return realpath(__DIR__ . '/../../locales/' . $locale . '/php.json');
+        return realpath(__DIR__ . '/../../locales/' . $locale . '/json.json');
+    }
+
+    public static function exists(string $locale): bool
+    {
+        return static::resolve($locale) !== false;
     }
 }
diff --git a/src/Native.php b/src/Native.php
@@ -56,6 +56,10 @@ protected static function locale(Locale|string|null $locale): ?string
             return null;
         }
 
-        return $locale->value ?? Locale::tryFrom($locale)?->value;
+        if (class_exists(Locale::class) && $locale instanceof Locale) {
+            return $locale->value;
+        }
+
+        return Path::exists($locale) ? $locale : null;
     }
 }
diff --git a/tests/Helpers/native.php b/tests/Helpers/native.php
@@ -19,5 +19,5 @@
 
 function sourceLocale(string $locale): array
 {
-    return Arr::file(__DIR__ . '/../../locales/' . $locale . '/php.json');
+    return Arr::file(__DIR__ . '/../../locales/' . $locale . '/json.json');
 }