Merge pull request #1075 from spiral/bugfix/translations

spiral · Feb 13, 2024 · 272e608 · 272e608
1 parent c87ea20
commit 272e608
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/Config/TranslatorConfig.php b/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/tests/ConfigTest.php b/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 change
@@ Expand Up @@
                 return \rtrim($directory, '/') . '/' . $locale . '/';
             }
-            return \trim($this->getLocalesDirectory(), '/') . '/' . $locale . '/';
+            return \rtrim($this->getLocalesDirectory(), '/') . '/' . $locale . '/';
         }
         /**
@@ Expand Down @@