bug #37449 [Translation] Fix caching of parent locales file in translator (jvasseur)

nicolas-grekas · nicolas-grekas · commit 78e6fc4b421a · 2020-06-30T15:55:33.000+02:00
This PR was merged into the 4.4 branch. Discussion ---------- [Translation] Fix caching of parent locales file in translator | Q | A | ------------- | --- | Branch? | 4.4 (this is the lowest maintained branch with this code) | Bug fix? | yes | New feature? | no  | Deprecations? | no  | Tickets | | License | MIT | Doc PR | The `parentLocales` property was probably meant as a cache for the content of the `parents.json` file but instead the content is stored in a local variable and the property stays `null`. This means the file is read on each call to `computeFallbackLocales`. This PR update the code to what was probably meant to be. (Ref #28070) Commits ------- 02c9ac6 Fix caching of parent locales file in translator
diff --git a/src/Symfony/Component/Translation/Translator.php b/src/Symfony/Component/Translation/Translator.php
@@ -460,7 +460,7 @@ private function loadFallbackCatalogues(string $locale): void
     protected function computeFallbackLocales($locale)
     {
         if (null === $this->parentLocales) {
-            $parentLocales = json_decode(file_get_contents(__DIR__.'/Resources/data/parents.json'), true);
+            $this->parentLocales = json_decode(file_get_contents(__DIR__.'/Resources/data/parents.json'), true);
         }
 
         $locales = [];
@@ -473,7 +473,7 @@ protected function computeFallbackLocales($locale)
         }
 
         while ($locale) {
-            $parent = $parentLocales[$locale] ?? null;
+            $parent = $this->parentLocales[$locale] ?? null;
 
             if ($parent) {
                 $locale = 'root' !== $parent ? $parent : null;

Original file line number	Diff line number	Diff line change
`@@ -460,7 +460,7 @@ private function loadFallbackCatalogues(string $locale): void`
`460`	`460`	`protected function computeFallbackLocales($locale)`
`461`	`461`	`{`
`462`	`462`	`if (null === $this->parentLocales) {`
`463`		`- $parentLocales = json_decode(file_get_contents(__DIR__.'/Resources/data/parents.json'), true);`
	`463`	`+ $this->parentLocales = json_decode(file_get_contents(__DIR__.'/Resources/data/parents.json'), true);`
`464`	`464`	`}`
`465`	`465`
`466`	`466`	`$locales = [];`
`@@ -473,7 +473,7 @@ protected function computeFallbackLocales($locale)`
`473`	`473`	`}`
`474`	`474`
`475`	`475`	`while ($locale) {`
`476`		`- $parent = $parentLocales[$locale] ?? null;`
	`476`	`+ $parent = $this->parentLocales[$locale] ?? null;`
`477`	`477`
`478`	`478`	`if ($parent) {`
`479`	`479`	`$locale = 'root' !== $parent ? $parent : null;`