fix translations support

mozex · Mar 3, 2024 · 9c9b852 · 9c9b852
1 parent c068b61
commit 9c9b852
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/config/modules.php b/config/modules.php
@@ -44,7 +44,7 @@
     AssetType::Translations->value => [
         'active' => true,
         'patterns' => [
-            '*/Resources/lang',
+            '*/Lang',
         ],
     ],
     AssetType::Schedules->value => [

diff --git a/src/ModulesServiceProvider.php b/src/ModulesServiceProvider.php
@@ -100,7 +100,10 @@ protected function bootTranslations(): void
 
         AssetType::Translations->scout()->collect()
             ->each(function (array $asset): void {
-                $this->loadTranslationsFrom($asset['path'], $asset['module']);
+                $this->loadTranslationsFrom(
+                    path: $asset['path'],
+                    namespace: $this->lowerDashedName($asset['module'])
+                );
                 $this->loadJsonTranslationsFrom($asset['path']);
             });
     }

diff --git a/tests/Feature/TranslationsTest.php b/tests/Feature/TranslationsTest.php
@@ -33,8 +33,8 @@
     expect($collection)
         ->each->toHaveKeys(['module', 'path', 'namespace'])
         ->and($collection->pluck('path'))
-        ->toContain(realpath(Modules::modulesPath('First/Resources/lang')))
-        ->toContain(realpath(Modules::modulesPath('Second/Resources/lang')));
+        ->toContain(realpath(Modules::modulesPath('First/Lang')))
+        ->toContain(realpath(Modules::modulesPath('Second/Lang')));
 
     if ($cache) {
         $discoverer->clear();
@@ -55,7 +55,7 @@
 
     $discoverer->collect()
         ->each(function (array $asset) use ($loader) {
-            expect($loader->namespaces())->toHaveKey($asset['module'])->toContain($asset['path'])
+            expect($loader->namespaces())->toHaveKey(strtolower($asset['module']))->toContain($asset['path'])
                 ->and($loader->jsonPaths())->toContain($asset['path']);
         });
 

diff --git a/...bench/Modules/First/Resources/lang/en.php → workbench/Modules/First/Lang/en.php b/...bench/Modules/First/Resources/lang/en.php → workbench/Modules/First/Lang/en.php
diff --git a/...ench/Modules/Second/Resources/lang/en.php → workbench/Modules/Second/Lang/en.php b/...ench/Modules/Second/Resources/lang/en.php → workbench/Modules/Second/Lang/en.php