[Translation:update][Xliff Dumper] Reviewed code and replaced undersc…

…ore by hyphen
symfony · Jul 11, 2014 · fdc3fb1 · fdc3fb1
1 parent 1951412
commit fdc3fb1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/src/Symfony/Component/Translation/Dumper/XliffFileDumper.php b/src/Symfony/Component/Translation/Dumper/XliffFileDumper.php
@@ -30,9 +30,10 @@ class XliffFileDumper extends FileDumper
      */
     public function dump(MessageCatalogue $messages, $options = array())
     {
-        $this->defaultLocale = \Locale::getDefault();
         if (array_key_exists('default_locale', $options)) {
             $this->defaultLocale = $options['default_locale'];
+        } else {
+            $this->defaultLocale = \Locale::getDefault();
         }
 
         parent::dump($messages, $options);
@@ -51,8 +52,8 @@ protected function format(MessageCatalogue $messages, $domain)
         $xliff->setAttribute('xmlns', 'urn:oasis:names:tc:xliff:document:1.2');
 
         $xliffFile = $xliff->appendChild($dom->createElement('file'));
-        $xliffFile->setAttribute('source-language', $this->defaultLocale);
-        $xliffFile->setAttribute('target-language', $messages->getLocale());
+        $xliffFile->setAttribute('source-language', str_replace('_', '-', $this->defaultLocale));
+        $xliffFile->setAttribute('target-language', str_replace('_', '-', $messages->getLocale()));
         $xliffFile->setAttribute('datatype', 'plaintext');
         $xliffFile->setAttribute('original', 'file.ext');
 

diff --git a/src/Symfony/Component/Translation/Tests/Dumper/XliffFileDumperTest.php b/src/Symfony/Component/Translation/Tests/Dumper/XliffFileDumperTest.php
@@ -18,15 +18,15 @@ class XliffFileDumperTest extends \PHPUnit_Framework_TestCase
 {
     public function testDump()
     {
-        $catalogue = new MessageCatalogue('en');
+        $catalogue = new MessageCatalogue('en_US');
         $catalogue->add(array('foo' => 'bar', 'key' => ''));
 
         $tempDir = sys_get_temp_dir();
         $dumper = new XliffFileDumper();
-        $dumper->dump($catalogue, array('path' => $tempDir, 'default_locale' => 'fr'));
+        $dumper->dump($catalogue, array('path' => $tempDir, 'default_locale' => 'fr_FR'));
 
-        $this->assertEquals(file_get_contents(__DIR__.'/../fixtures/resources-clean.xlf'), file_get_contents($tempDir.'/messages.en.xlf'));
+        $this->assertEquals(file_get_contents(__DIR__.'/../fixtures/resources-clean.xlf'), file_get_contents($tempDir.'/messages.en_US.xlf'));
 
-        unlink($tempDir.'/messages.en.xlf');
+        unlink($tempDir.'/messages.en_US.xlf');
     }
 }
diff --git a/src/Symfony/Component/Translation/Tests/fixtures/resources-clean.xlf b/src/Symfony/Component/Translation/Tests/fixtures/resources-clean.xlf
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
-  <file source-language="fr" target-language="en" datatype="plaintext" original="file.ext">
+  <file source-language="fr-FR" target-language="en-US" datatype="plaintext" original="file.ext">
     <body>
       <trans-unit id="acbd18db4cc2f85cedef654fccc4a4d8" resname="foo">
         <source>foo</source>