Merge pull request #1075 from spiral/bugfix/translations

msmakouz · web-flow · commit 72934fba3491 · 2024-02-13T10:37:11.000+02:00
[spiral/translator] Fixed `getLocaleDirectory` method
diff --git a/src/Translator/src/Config/TranslatorConfig.php b/src/Translator/src/Config/TranslatorConfig.php
@@ -105,7 +105,7 @@ public function getLocaleDirectory(string $locale, ?string $directory = null): s
             return \rtrim($directory, '/') . '/' . $locale . '/';
         }
 
-        return \trim($this->getLocalesDirectory(), '/') . '/' . $locale . '/';
+        return \rtrim($this->getLocalesDirectory(), '/') . '/' . $locale . '/';
     }
 
     /**
diff --git a/src/Translator/tests/ConfigTest.php b/src/Translator/tests/ConfigTest.php
@@ -101,6 +101,15 @@ public function testLocaleDirectoryWithDirectoryParam(): void
         $this->assertSame('directory/en/', $config->getLocaleDirectory('en', 'directory/'));
     }
 
+    public function testLocaleDirectoryLeadingSlash(): void
+    {
+        $config = new TranslatorConfig([
+            'directory' => '/directory/locale'
+        ]);
+
+        $this->assertSame('/directory/locale/en/', $config->getLocaleDirectory('en'));
+    }
+
     public function testDomains(): void
     {
         $config = new TranslatorConfig([

Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ public function getLocaleDirectory(string $locale, ?string $directory = null): s`
`105`	`105`	`return \rtrim($directory, '/') . '/' . $locale . '/';`
`106`	`106`	`}`
`107`	`107`
`108`		`- return \trim($this->getLocalesDirectory(), '/') . '/' . $locale . '/';`
	`108`	`+ return \rtrim($this->getLocalesDirectory(), '/') . '/' . $locale . '/';`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`/**`