[FrameworkBundle][Translation][debug mode] refresh cache when resourc…

…es is changed.
symfony · Mar 21, 2015 · e36f1a7 · e36f1a7
1 parent d1131db
commit e36f1a7
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Translation/TranslatorTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Translation/TranslatorTest.php
@@ -122,6 +122,12 @@ public function testLoadRessourcesWithCaching()
         $translator->setLocale('fr');
 
         $this->assertEquals('répertoire', $translator->trans('folder'));
+
+        // refresh cache when resources is changed in debug mode.
+        $translator = $this->getTranslator($loader, array('cache_dir' => $this->tmpDir, 'debug' => true), array(), 'yml');
+        $translator->setLocale('fr');
+
+        $this->assertEquals('folder', $translator->trans('folder'));
     }
 
     public function testLoadRessourcesWithoutCaching()

diff --git a/src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php b/src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php
@@ -63,6 +63,18 @@ public function __construct(ContainerInterface $container, MessageSelector $sele
         parent::__construct(null, $selector, $this->options['cache_dir'], $this->options['debug']);
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    protected function loadCatalogue($locale)
+    {
+        if (null !== $this->options['cache_dir'] && $this->options['debug']) {
+            $this->loadResources($locale);
+        }
+
+        parent::loadCatalogue($locale);
+    }
+
     /**
      * {@inheritdoc}
      */