bug symfony#17596 [Translation] Add resources from fallback locale to parent catalogue (c960657)

fabpot · fabpot · commit 27de563236bd · 2016-01-31T08:53:09.000+01:00
This PR was merged into the 2.3 branch. Discussion ---------- [Translation] Add resources from fallback locale to parent catalogue | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - The resources representing a locale includes those of the fallback locale. However, `getCatalogue()->getResources()` only returns the resources belonging specifically to the selected locale. Example: The locale `en_GB` falls back to `en`. I use the locale `en_GB`. During development, when I modify the `en_GB` translation file, the changes appear instantly when reloading the page. If I modify the `en` translation file, I need to manually clear the cache in order for the new translation to appear. I believe this is a regression that was introduced in symfony#15527. This patch is for the 2.3 branch. For 2.6 and later, the test can be updated to use the getCatalogue() method instead of using ReflectionProperty. Commits ------- f7f82fa [Translation] Add resources from fallback locale
diff --git a/src/Symfony/Component/Translation/Tests/TranslatorTest.php b/src/Symfony/Component/Translation/Tests/TranslatorTest.php
@@ -239,6 +239,30 @@ public function testWhenAResourceHasNoRegisteredLoader()
         $translator->trans('foo');
     }
 
+    public function testFallbackCatalogueResources()
+    {
+        $translator = new Translator('en_GB', new MessageSelector());
+        $translator->addLoader('yml', new \Symfony\Component\Translation\Loader\YamlFileLoader());
+        $translator->addResource('yml', __DIR__.'/fixtures/empty.yml', 'en_GB');
+        $translator->addResource('yml', __DIR__.'/fixtures/resources.yml', 'en');
+
+        // force catalogue loading
+        $this->assertEquals('bar', $translator->trans('foo', array()));
+
+        $cataloguesProperty = new \ReflectionProperty($translator, 'catalogues');
+        $cataloguesProperty->setAccessible(true);
+        $catalogues = $cataloguesProperty->getValue($translator);
+
+        $resources = $catalogues['en']->getResources();
+        $this->assertCount(1, $resources);
+        $this->assertContains( __DIR__.'/fixtures/resources.yml', $resources);
+
+        $resources = $catalogues['en_GB']->getResources();
+        $this->assertCount(2, $resources);
+        $this->assertContains( __DIR__.'/fixtures/empty.yml', $resources);
+        $this->assertContains( __DIR__.'/fixtures/resources.yml', $resources);
+    }
+
     /**
      * @dataProvider getTransTests
      */
diff --git a/src/Symfony/Component/Translation/Translator.php b/src/Symfony/Component/Translation/Translator.php
@@ -255,6 +255,9 @@ private function loadFallbackCatalogues($locale)
             }
 
             $fallbackCatalogue = new MessageCatalogue($fallback, $this->catalogues[$fallback]->all());
+            foreach ($this->catalogues[$fallback]->getResources() as $resource) {
+                $fallbackCatalogue->addResource($resource);
+            }
             $current->addFallbackCatalogue($fallbackCatalogue);
             $current = $fallbackCatalogue;
         }

Original file line number	Diff line number	Diff line change
`@@ -255,6 +255,9 @@ private function loadFallbackCatalogues($locale)`
`255`	`255`	`}`
`256`	`256`
`257`	`257`	`$fallbackCatalogue = new MessageCatalogue($fallback, $this->catalogues[$fallback]->all());`
	`258`	`+ foreach ($this->catalogues[$fallback]->getResources() as $resource) {`
	`259`	`+ $fallbackCatalogue->addResource($resource);`
	`260`	`+ }`
`258`	`261`	`$current->addFallbackCatalogue($fallbackCatalogue);`
`259`	`262`	`$current = $fallbackCatalogue;`
`260`	`263`	`}`