[Translation][cache fallback] keep only missing messages in fallbackCatalogue.

aitboudad · aitboudad · commit 00f84f07c53e · 2015-04-11T16:58:59.000+01:00
diff --git a/src/Symfony/Component/Translation/Translator.php b/src/Symfony/Component/Translation/Translator.php
@@ -16,6 +16,7 @@
 use Symfony\Component\Config\ConfigCacheInterface;
 use Symfony\Component\Config\ConfigCacheFactoryInterface;
 use Symfony\Component\Config\ConfigCacheFactory;
+use Symfony\Component\Translation\Catalogue\DiffOperation;
 
 /**
  * Translator.
@@ -420,21 +421,6 @@ public function dumpCatalogue($locale, ConfigCacheInterface $cache)
 
     private function getFallbackContent(MessageCatalogue $catalogue)
     {
-        if (!$this->debug) {
-            // merge all fallback catalogues messages into $catalogue
-            $fallbackCatalogue = $catalogue->getFallbackCatalogue();
-            $messages = $catalogue->all();
-            while ($fallbackCatalogue) {
-                $messages = array_replace_recursive($fallbackCatalogue->all(), $messages);
-                $fallbackCatalogue = $fallbackCatalogue->getFallbackCatalogue();
-            }
-            foreach ($messages as $domain => $domainMessages) {
-                $catalogue->add($domainMessages, $domain);
-            }
-
-            return '';
-        }
-
         $fallbackContent = '';
         $current = '';
         $replacementPattern = '/[^a-z0-9_]/i';
@@ -444,6 +430,14 @@ private function getFallbackContent(MessageCatalogue $catalogue)
             $fallbackSuffix = ucfirst(preg_replace($replacementPattern, '_', $fallback));
             $currentSuffix = ucfirst(preg_replace($replacementPattern, '_', $current));
 
+            $fallbackMessages = $fallbackCatalogue->all();
+            if (!$this->debug) {
+                // keep only missing messages.
+                $currentCatalogue = new MessageCatalogue($fallbackCatalogue->getLocale(), $catalogue->all());
+                $operation = new DiffOperation($currentCatalogue, $fallbackCatalogue);
+                $fallbackMessages = $operation->getResult()->all();
+            }
+
             $fallbackContent .= sprintf(<<<EOF
 \$catalogue%s = new MessageCatalogue('%s', %s);
 \$catalogue%s->addFallbackCatalogue(\$catalogue%s);
@@ -452,7 +446,7 @@ private function getFallbackContent(MessageCatalogue $catalogue)
                 ,
                 $fallbackSuffix,
                 $fallback,
-                var_export($fallbackCatalogue->all(), true),
+                var_export($fallbackMessages, true),
                 $currentSuffix,
                 $fallbackSuffix
             );
