Nested-folders-support (#99)

Co-authored-by: 2btech.dev2 <2btech.dev2@gmail.com>
MohmmedAshraf · Apr 20, 2024 · fb41286 · fb41286
1 parent 6766aa6
commit fb41286
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/src/Actions/SyncPhrasesAction.php b/src/Actions/SyncPhrasesAction.php
@@ -26,10 +26,12 @@ public static function execute(Translation $source, $key, $value, $locale, $file
         ]);
 
         $isRoot = $file === $locale.'.json' || $file === $locale.'.php';
+        $extension = pathinfo($file, PATHINFO_EXTENSION);
+        $filePath = str_replace('.'.$extension, '', str_replace($locale.DIRECTORY_SEPARATOR, '', $file));
 
         $translationFile = TranslationFile::firstOrCreate([
-            'name' => pathinfo($file, PATHINFO_FILENAME),
-            'extension' => pathinfo($file, PATHINFO_EXTENSION),
+            'name' => $filePath,
+            'extension' => $extension,
             'is_root' => $isRoot,
         ]);
 

diff --git a/src/TranslationsManager.php b/src/TranslationsManager.php
@@ -9,6 +9,7 @@
 use Illuminate\Filesystem\Filesystem;
 use Illuminate\Support\Str;
 use Outhebox\TranslationsUI\Models\Translation;
+use Symfony\Component\Finder\SplFileInfo;
 use ZipArchive;
 
 class TranslationsManager
@@ -67,8 +68,11 @@ public function getTranslations(string $locale): array
         }
 
         collect($files)
-            ->map(function ($file) use ($locale) {
-                return $locale.DIRECTORY_SEPARATOR.$file->getFilename();
+            ->map(function (SplFileInfo $file) use ($locale) {
+                if ($file->getRelativePath() === '') {
+                    return $locale.DIRECTORY_SEPARATOR.$file->getFilename();
+                }
+                return $locale.DIRECTORY_SEPARATOR.$file->getRelativePath().DIRECTORY_SEPARATOR.$file->getFilename();
             })
             ->when($this->filesystem->exists(lang_path($rootFileName)), function ($collection) use ($rootFileName) {
                 return $collection->prepend($rootFileName);
@@ -103,7 +107,6 @@ public function getTranslations(string $locale): array
                     $translations[$file] = [];
                 }
             });
-
         return $translations;
     }