replaced calls to with to produce flat message arrays

willdurand · Oct 12, 2013 · 88a0ae2 · 88a0ae2
1 parent d3f6051
commit 88a0ae2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/Controller/Controller.php b/Controller/Controller.php
@@ -119,11 +119,7 @@ public function exposeTranslationAction(Request $request, $domain_name, $_locale
 
             $messages = array();
             foreach ($catalogues as $catalogue) {
-                $messages = array_merge_recursive($messages, $catalogue->all());
-            }
-
-            foreach ($messages as &$domain) {
-                $domain = array_map(function($m){ return is_array($m) ? end($m) : $m; }, $domain);
+                $messages = array_replace_recursive($messages, $catalogue->all());
             }
 
             $content = $this->engine->render('BazingaExposeTranslationBundle::exposeTranslation.' . $_format . '.twig', array(

diff --git a/Dumper/TranslationDumper.php b/Dumper/TranslationDumper.php
@@ -101,8 +101,6 @@ public function dump($targetDir = 'web', $symlink = false, $directory = null)
         foreach ($this->getTranslationMessages() as $locale => $domains) {
             foreach ($domains as $domain => $messageList) {
                 foreach ($formats as $format) {
-                    $messageList = array_map(function($m){ return is_array($m) ? end($m) : $m; }, $messageList);
-
                     $content = $this->engine->render('BazingaExposeTranslationBundle::exposeTranslation.' . $format . '.twig', array(
                         'messages'        => array($domain => $messageList),
                         'locale'          => $locale,
@@ -160,7 +158,7 @@ private function getTranslationMessages()
                 $catalogue = $this->loaders[$extension]->load($file, $locale, $domain);
 
                 if (isset($messages[$locale])) {
-                    $messages[$locale] = array_merge_recursive($messages[$locale], $catalogue->all());
+                    $messages[$locale] = array_replace_recursive($messages[$locale], $catalogue->all());
                 } else {
                     $messages[$locale] = $catalogue->all();
                 }