bug #22255 [Translation] avoid creating cache files for fallback locales. (aitboudad)

fabpot · fabpot · commit a2003579e99b · 2017-04-05T07:56:27.000-07:00
This PR was merged into the 2.7 branch. Discussion ---------- [Translation] avoid creating cache files for fallback locales. | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #21163 | License | MIT | Doc PR | ~ Commits ------- 22425b2 [Translation] avoid creating cache files for fallback locales.
diff --git a/src/Symfony/Component/Translation/Tests/TranslatorCacheTest.php b/src/Symfony/Component/Translation/Tests/TranslatorCacheTest.php
@@ -149,6 +149,17 @@ public function testDifferentTranslatorsForSameLocaleDoNotOverwriteEachOthersCac
         $this->assertEquals('OK', $translator->trans($msgid), '-> the cache was overwritten by another translator instance in '.($debug ? 'debug' : 'production'));
     }
 
+    public function testGeneratedCacheFilesAreOnlyBelongRequestedLocales()
+    {
+        $translator = new Translator('a', null, $this->tmpDir);
+        $translator->setFallbackLocales(array('b'));
+        $translator->trans('bar');
+
+        $cachedFiles = glob($this->tmpDir.'/*.php');
+
+        $this->assertCount(1, $cachedFiles);
+    }
+
     public function testDifferentCacheFilesAreUsedForDifferentSetsOfFallbackLocales()
     {
         /*
diff --git a/src/Symfony/Component/Translation/Translator.php b/src/Symfony/Component/Translation/Translator.php
@@ -420,7 +420,7 @@ private function loadFallbackCatalogues($locale)
 
         foreach ($this->computeFallbackLocales($locale) as $fallback) {
             if (!isset($this->catalogues[$fallback])) {
-                $this->loadCatalogue($fallback);
+                $this->initializeCatalogue($fallback);
             }
 
             $fallbackCatalogue = new MessageCatalogue($fallback, $this->catalogues[$fallback]->all());

Original file line number	Diff line number	Diff line change
`@@ -420,7 +420,7 @@ private function loadFallbackCatalogues($locale)`
`420`	`420`
`421`	`421`	`foreach ($this->computeFallbackLocales($locale) as $fallback) {`
`422`	`422`	`if (!isset($this->catalogues[$fallback])) {`
`423`		`- $this->loadCatalogue($fallback);`
	`423`	`+ $this->initializeCatalogue($fallback);`
`424`	`424`	`}`
`425`	`425`
`426`	`426`	`$fallbackCatalogue = new MessageCatalogue($fallback, $this->catalogues[$fallback]->all());`