bug #30919 [Translator] Fix wrong dump for PO files (deguif)

fabpot · fabpot · commit 09a808dc88ed · 2019-04-06T19:57:17.000+02:00
This PR was merged into the 3.4 branch. Discussion ---------- [Translator] Fix wrong dump for PO files | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | When working on #30909 I encountered this bug. Currently the tests were passing, because the po fixture file contained only one translation. Commits ------- b54abfc Fix wrong dump for PO files
diff --git 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
@@ -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
@@ -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
@@ -5,4 +5,7 @@ msgstr ""
 "Language: en\n"
 
 msgid "foo"
-msgstr "bar"
+msgstr "bar"
+
+msgid "bar"
+msgstr "foo"

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public function formatCatalogue(MessageCatalogue $messages, $domain, array $opti`
`40`	`40`	`$newLine = true;`
`41`	`41`	`}`
`42`	`42`	`$output .= sprintf('msgid "%s"'."\n", $this->escape($source));`
`43`		`- $output .= sprintf('msgstr "%s"', $this->escape($target));`
	`43`	`+ $output .= sprintf('msgstr "%s"'."\n", $this->escape($target));`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`return $output;`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ class PoFileDumperTest extends TestCase`
`20`	`20`	`public function testFormatCatalogue()`
`21`	`21`	`{`
`22`	`22`	`$catalogue = new MessageCatalogue('en');`
`23`		`- $catalogue->add(['foo' => 'bar']);`
	`23`	`+ $catalogue->add(['foo' => 'bar', 'bar' => 'foo']);`
`24`	`24`
`25`	`25`	`$dumper = new PoFileDumper();`
`26`	`26`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public function testLoad()`
`23`	`23`	`$resource = __DIR__.'/../fixtures/resources.po';`
`24`	`24`	`$catalogue = $loader->load($resource, 'en', 'domain1');`
`25`	`25`
`26`		`- $this->assertEquals(['foo' => 'bar'], $catalogue->all('domain1'));`
	`26`	`+ $this->assertEquals(['foo' => 'bar', 'bar' => 'foo'], $catalogue->all('domain1'));`
`27`	`27`	`$this->assertEquals('en', $catalogue->getLocale());`
`28`	`28`	`$this->assertEquals([new FileResource($resource)], $catalogue->getResources());`
`29`	`29`	`}`