[10.x] Fix - The Translator may incorrectly report the locale of a …

…missing translation key (#49900) * fix: "Translator" returns correct locale for missing keys * chore: variable rename
laravel · Jan 30, 2024 · 41bd2c1 · 41bd2c1
1 parent 85f06e8
commit 41bd2c1
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/src/Illuminate/Translation/Translator.php b/src/Illuminate/Translation/Translator.php
@@ -160,9 +160,9 @@ public function get($key, array $replace = [], $locale = null, $fallback = true)
             // the translator was instantiated. Then, we can load the lines and return.
             $locales = $fallback ? $this->localeArray($locale) : [$locale];
 
-            foreach ($locales as $locale) {
+            foreach ($locales as $languageLineLocale) {
                 if (! is_null($line = $this->getLine(
-                    $namespace, $group, $locale, $item, $replace
+                    $namespace, $group, $languageLineLocale, $item, $replace
                 ))) {
                     return $line;
                 }

diff --git a/tests/Integration/Translation/TranslatorTest.php b/tests/Integration/Translation/TranslatorTest.php
@@ -70,4 +70,17 @@ public function testItCanHandleMissingKeysNoReturn()
 
         $this->app['translator']->handleMissingKeysUsing(null);
     }
+
+    public function testItReturnsCorrectLocaleForMissingKeys()
+    {
+        $this->app['translator']->handleMissingKeysUsing(function ($key, $replacements, $locale) {
+            $_SERVER['__missing_translation_key_locale'] = $locale;
+        });
+
+        $this->app['translator']->get('some missing key', [], 'ht');
+
+        $this->assertSame('ht', $_SERVER['__missing_translation_key_locale']);
+
+        $this->app['translator']->handleMissingKeysUsing(null);
+    }
 }