From 504041a3b93bbb852a2c5a36835465ab75cb3e35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois-Xavier=20de=20Guillebon?= Date: Sat, 6 Apr 2019 18:57:58 +0200 Subject: [PATCH] Fix wrong dump for PO files --- src/Symfony/Component/Translation/Dumper/PoFileDumper.php | 2 +- .../Component/Translation/Tests/Dumper/PoFileDumperTest.php | 2 +- .../Component/Translation/Tests/Loader/PoFileLoaderTest.php | 2 +- .../Component/Translation/Tests/fixtures/resources.po | 5 ++++- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/Symfony/Component/Translation/Dumper/PoFileDumper.php b/src/Symfony/Component/Translation/Dumper/PoFileDumper.php index e9673b6d29908..0f7e6fa834bc2 100644 --- a/src/Symfony/Component/Translation/Dumper/PoFileDumper.php +++ b/src/Symfony/Component/Translation/Dumper/PoFileDumper.php @@ -40,7 +40,7 @@ public function formatCatalogue(MessageCatalogue $messages, $domain, array $opti $newLine = true; } $output .= sprintf('msgid "%s"'."\n", $this->escape($source)); - $output .= sprintf('msgstr "%s"', $this->escape($target)); + $output .= sprintf('msgstr "%s"'."\n", $this->escape($target)); } return $output; diff --git a/src/Symfony/Component/Translation/Tests/Dumper/PoFileDumperTest.php b/src/Symfony/Component/Translation/Tests/Dumper/PoFileDumperTest.php index d694a6dd3fb11..960ec2df6500c 100644 --- a/src/Symfony/Component/Translation/Tests/Dumper/PoFileDumperTest.php +++ b/src/Symfony/Component/Translation/Tests/Dumper/PoFileDumperTest.php @@ -20,7 +20,7 @@ class PoFileDumperTest extends TestCase public function testFormatCatalogue() { $catalogue = new MessageCatalogue('en'); - $catalogue->add(['foo' => 'bar']); + $catalogue->add(['foo' => 'bar', 'bar' => 'foo']); $dumper = new PoFileDumper(); diff --git a/src/Symfony/Component/Translation/Tests/Loader/PoFileLoaderTest.php b/src/Symfony/Component/Translation/Tests/Loader/PoFileLoaderTest.php index 4bf2ee6545b6f..d8e2c1993ba1c 100644 --- a/src/Symfony/Component/Translation/Tests/Loader/PoFileLoaderTest.php +++ b/src/Symfony/Component/Translation/Tests/Loader/PoFileLoaderTest.php @@ -23,7 +23,7 @@ public function testLoad() $resource = __DIR__.'/../fixtures/resources.po'; $catalogue = $loader->load($resource, 'en', 'domain1'); - $this->assertEquals(['foo' => 'bar'], $catalogue->all('domain1')); + $this->assertEquals(['foo' => 'bar', 'bar' => 'foo'], $catalogue->all('domain1')); $this->assertEquals('en', $catalogue->getLocale()); $this->assertEquals([new FileResource($resource)], $catalogue->getResources()); } diff --git a/src/Symfony/Component/Translation/Tests/fixtures/resources.po b/src/Symfony/Component/Translation/Tests/fixtures/resources.po index ccfce6bb98d46..a20e619828ce6 100644 --- a/src/Symfony/Component/Translation/Tests/fixtures/resources.po +++ b/src/Symfony/Component/Translation/Tests/fixtures/resources.po @@ -5,4 +5,7 @@ msgstr "" "Language: en\n" msgid "foo" -msgstr "bar" \ No newline at end of file +msgstr "bar" + +msgid "bar" +msgstr "foo"