From fdc3fb132c64195925b37cd96e7ba076abaa6298 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Gautier?= Date: Fri, 11 Jul 2014 11:42:41 +0200 Subject: [PATCH] [Translation:update][Xliff Dumper] Reviewed code and replaced underscore by hyphen --- .../Component/Translation/Dumper/XliffFileDumper.php | 7 ++++--- .../Translation/Tests/Dumper/XliffFileDumperTest.php | 8 ++++---- .../Translation/Tests/fixtures/resources-clean.xlf | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/Symfony/Component/Translation/Dumper/XliffFileDumper.php b/src/Symfony/Component/Translation/Dumper/XliffFileDumper.php index d881f6e6b2..ec52234056 100644 --- 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 @@ class XliffFileDumper extends FileDumper $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 index 358f13f565..8331be76b9 100644 --- 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 index 3ab72eb110..f0fd60eb6f 100644 --- a/src/Symfony/Component/Translation/Tests/fixtures/resources-clean.xlf +++ b/src/Symfony/Component/Translation/Tests/fixtures/resources-clean.xlf @@ -1,6 +1,6 @@ - + foo