Preserve translation ids that are numeric values

Fix #83
willdurand · Jan 3, 2014 · 734a21c · 734a21c
1 parent 0996839
commit 734a21c
Show file tree

Hide file tree

Showing 5 changed files with 61 additions and 2 deletions.
diff --git a/Controller/Controller.php b/Controller/Controller.php
@@ -128,7 +128,7 @@ public function getTranslationsAction(Request $request, $domain, $_format)
                         $catalogue   = $this->loaders[$extension]
                             ->load($file, $locale, $domain);
 
-                        $translations[$locale][$domain] = array_merge_recursive(
+                        $translations[$locale][$domain] = array_replace_recursive(
                             $translations[$locale][$domain],
                             $catalogue->all($domain)
                         );

diff --git a/Dumper/TranslationDumper.php b/Dumper/TranslationDumper.php
@@ -182,7 +182,7 @@ private function getTranslations()
                 $catalogue = $this->loaders[$extension]
                     ->load($file, $locale, $domain);
 
-                $translations[$locale][$domain] = array_merge_recursive(
+                $translations[$locale][$domain] = array_replace_recursive(
                     $translations[$locale][$domain],
                     $catalogue->all($domain)
                 );

diff --git a/Tests/Controller/ControllerTest.php b/Tests/Controller/ControllerTest.php
@@ -153,4 +153,22 @@ public function testGetJsTranslationsWithUnknownLocale()
 JS
         , $response->getContent());
     }
+
+    public function testGetTranslationsWithNumericKeys()
+    {
+        $client  = static::createClient();
+
+        $crawler  = $client->request('GET', '/translations/numerics.json?locales=en');
+        $response = $client->getResponse();
+
+        $this->assertEquals(<<<JSON
+{
+    "fallback": "en",
+    "defaultDomain": "messages",
+    "translations": {"en":{"numerics":{"7":"Nos occasions","8":"Nous contacter","12":"pr\u00e9nom","13":"nom","14":"adresse","15":"code postal"}}}
+}
+
+JSON
+        , $response->getContent());
+    }
 }
diff --git a/Tests/Dumper/TranslationDumperTest.php b/Tests/Dumper/TranslationDumperTest.php
@@ -45,6 +45,8 @@ public function testDump()
             'messages/fr.json',
             'foo/en.js',
             'foo/en.json',
+            'numerics/en.js',
+            'numerics/en.json',
         ) as $file) {
             $this->assertFileExists($this->target . '/translations/' . $file);
         }
@@ -100,5 +102,13 @@ public function testDump()
 
 JSON
         , file_get_contents($this->target . '/translations/config.json'));
+
+        $this->assertEquals(<<<JSON
+{
+    "translations": {"en":{"numerics":{"7":"Nos occasions","8":"Nous contacter","12":"pr\u00e9nom","13":"nom","14":"adresse","15":"code postal"}}}
+}
+
+JSON
+        , file_get_contents($this->target . '/translations/numerics/en.json'));
     }
 }
diff --git a/Tests/Fixtures/app/Resources/translations/numerics.en.xliff b/Tests/Fixtures/app/Resources/translations/numerics.en.xliff
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
+    <file source-language="en" datatype="plaintext" original="file.ext">
+        <body>
+            <trans-unit id="1">
+                <source>7</source>
+                <target>Nos occasions</target>
+            </trans-unit>
+            <trans-unit id="2">
+                <source>8</source>
+                <target>Nous contacter</target>
+            </trans-unit>
+            <trans-unit id="3">
+                <source>12</source>
+                <target>prénom</target>
+            </trans-unit>
+            <trans-unit id="4">
+                <source>13</source>
+                <target>nom</target>
+            </trans-unit>
+            <trans-unit id="5">
+                <source>14</source>
+                <target>adresse</target>
+            </trans-unit>
+            <trans-unit id="6">
+                <source>15</source>
+                <target>code postal</target>
+            </trans-unit>
+        </body>
+    </file>
+</xliff>