Locale path for plugin (#73)

* fix: locale path for plugin * fix: retrocompatibility * fix: retrocompatibility * fix: tests * fix: test coverage
bedita · Oct 21, 2022 · a1978e8 · a1978e8
1 parent 3b9fa79
commit a1978e8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 15 deletions.
diff --git a/src/Command/GettextCommand.php b/src/Command/GettextCommand.php
@@ -185,12 +185,8 @@ private function setupPaths(Arguments $args): void
             ];
             $this->templatePaths = array_merge($paths, App::path(View::NAME_TEMPLATE, $plugin));
             $this->defaultDomain = $plugin;
-            foreach ($localesPaths as $path) {
-                if (strpos($path, sprintf('%s%s%s', DS, $plugin, DS)) > 0) {
-                    $this->localePath = $path;
-                    break;
-                }
-            }
+            $localePaths = App::path('locales', $plugin);
+            $this->localePath = (string)Hash::get($localePaths, '0');
 
             return;
         }

diff --git a/tests/TestCase/Command/GettextCommandTest.php b/tests/TestCase/Command/GettextCommandTest.php
@@ -73,9 +73,6 @@ public function testBuildOptionParser(): void
      *
      * @return void
      * @covers ::execute()
-     * @covers ::getPoResult()
-     * @covers ::getTemplatePaths()
-     * @covers ::getLocalePath()
      */
     public function testExecute(): void
     {
@@ -100,9 +97,6 @@ public function testExecute(): void
      *
      * @return void
      * @covers ::execute()
-     * @covers ::getPoResult()
-     * @covers ::getTemplatePaths()
-     * @covers ::getLocalePath()
      */
     public function testUpdateWithCi(): void
     {
@@ -156,7 +150,7 @@ public function setupPathsProvider(): array
                     sprintf('%s/tests/test_app/plugins/Dummy/config', $base),
                     sprintf('%s/tests/test_app/plugins/Dummy/templates', $base),
                 ], // template paths
-                sprintf('%s/tests/test_app/plugins/Dummy/Locale', $base), // locale path
+                sprintf('%s/tests/test_app/plugins/Dummy/resources/locales', $base), // locale path
             ],
         ];
     }
@@ -172,10 +166,11 @@ public function setupPathsProvider(): array
      * @return void
      * @dataProvider setupPathsProvider
      * @covers ::setupPaths()
+     * @covers ::getTemplatePaths()
+     * @covers ::getLocalePath()
      */
     public function testSetupPaths($appPath, $startPath, $pluginName, array $expectedTemplatePaths, string $expectedLocalePath): void
     {
-        $expectedPoName = 'default.po';
         $options = [];
         if (!empty($appPath)) {
             $options['app'] = sprintf('%s/%s', getcwd(), $appPath);
@@ -185,7 +180,6 @@ public function testSetupPaths($appPath, $startPath, $pluginName, array $expecte
         }
         if (!empty($pluginName)) {
             $options['plugin'] = $pluginName;
-            $expectedPoName = sprintf('%s.po', $pluginName);
         }
         $args = new Arguments([], $options, []);
         $method = self::getMethod('setupPaths');
@@ -473,6 +467,7 @@ public function parseFileProvider(): array
      * @return void
      * @dataProvider parseFileProvider
      * @covers ::parseFile()
+     * @covers ::getPoResult()
      */
     public function testParseFile(string $file, string $extension, array $expected): void
     {