Should respect the locale JSON file structure set by Laravel

MohmmedAshraf · Feb 2, 2024 · 939a204 · 939a204
1 parent c1bf7f3
commit 939a204
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/TranslationsManager.php b/src/TranslationsManager.php
@@ -116,7 +116,11 @@ public function export($download = false): void
 
             foreach ($phrasesTree as $locale => $groups) {
                 foreach ($groups as $file => $phrases) {
-                    $langPath = $download ? storage_path("app/translations/$locale/$file") : lang_path("$locale/$file");
+                    if ($file === "$locale.json") {
+                        $langPath = $download ? storage_path("app/translations/$file") : lang_path("$file");
+                    } else {
+                        $langPath = $download ? storage_path("app/translations/$locale/$file") : lang_path("$locale/$file");
+                    }
 
                     if (! $this->filesystem->isDirectory(dirname($langPath))) {
                         $this->filesystem->makeDirectory(dirname($langPath), 0755, true);

diff --git a/src/helpers.php b/src/helpers.php
@@ -60,6 +60,10 @@ function buildPhrasesTree($phrases, $locale): array
 
         /** @var \Outhebox\TranslationsUI\Models\Phrase $phrase */
         foreach ($phrases as $phrase) {
+            if ($phrase->file->file_name === "$locale.json") {
+                $tree[$locale][$phrase->file->file_name][$phrase->key] = ! blank($phrase->value) ? $phrase->value : $phrase->source->value;
+                continue;
+            }
             setArrayValue(
                 array: $tree[$locale][$phrase->file->file_name],
                 key: $phrase->key,