bug #15516 [Translator][warmup][fallback locales] fixed missing cache file generation. (aitboudad)

aitboudad · aitboudad · commit 2ae2714dbf5d · 2015-09-10T11:41:15.000Z
This PR was merged into the 2.7 branch. Discussion ---------- [Translator][warmup][fallback locales] fixed missing cache file generation. | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Fixed tickets | #15364 | Tests pass? | yes | License | MIT Commits ------- cade651 [Translator][warmup][fallback locales] fixed missing cache file generation.
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Translation/TranslatorTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Translation/TranslatorTest.php
@@ -273,7 +273,7 @@ public function testWarmup()
 
         // prime the cache
         $translator = $this->getTranslator($loader, array('cache_dir' => $this->tmpDir, 'resource_files' => $resourceFiles), 'yml');
-        $translator->setLocale('fr');
+        $translator->setFallbackLocales(array('fr'));
         $translator->warmup($this->tmpDir);
 
         $loader = $this->getMock('Symfony\Component\Translation\Loader\LoaderInterface');
@@ -283,6 +283,7 @@ public function testWarmup()
 
         $translator = $this->getTranslator($loader, array('cache_dir' => $this->tmpDir, 'resource_files' => $resourceFiles), 'yml');
         $translator->setLocale('fr');
+        $translator->setFallbackLocales(array('fr'));
         $this->assertEquals('répertoire', $translator->trans('folder'));
     }
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php b/src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php
@@ -82,7 +82,13 @@ public function warmUp($cacheDir)
             return;
         }
 
-        foreach ($this->resourceLocales as $locale) {
+        $locales = array_merge($this->getFallbackLocales(), array($this->getLocale()), $this->resourceLocales);
+        foreach (array_unique($locales) as $locale) {
+            // reset catalogue in case it's already loaded during the dump of the other locales.
+            if (isset($this->catalogues[$locale])) {
+                unset($this->catalogues[$locale]);
+            }
+
             $this->loadCatalogue($locale);
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,13 @@ public function warmUp($cacheDir)`
`82`	`82`	`return;`
`83`	`83`	`}`
`84`	`84`
`85`		`- foreach ($this->resourceLocales as $locale) {`
	`85`	`+ $locales = array_merge($this->getFallbackLocales(), array($this->getLocale()), $this->resourceLocales);`
	`86`	`+ foreach (array_unique($locales) as $locale) {`
	`87`	`+ // reset catalogue in case it's already loaded during the dump of the other locales.`
	`88`	`+ if (isset($this->catalogues[$locale])) {`
	`89`	`+ unset($this->catalogues[$locale]);`
	`90`	`+ }`
	`91`	`+`
`86`	`92`	`$this->loadCatalogue($locale);`
`87`	`93`	`}`
`88`	`94`	`}`