Merge branch '3.4' into 4.2

* 3.4:
  Fix wrong dump for PO files
This commit is contained in:
Fabien Potencier 2019-04-06 19:57:40 +02:00
commit 4c3a48a66f
4 changed files with 7 additions and 4 deletions

View File

@ -40,7 +40,7 @@ class PoFileDumper extends FileDumper
$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;

View File

@ -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();

View File

@ -23,7 +23,7 @@ class PoFileLoaderTest extends TestCase
$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());
}

View File

@ -5,4 +5,7 @@ msgstr ""
"Language: en\n"
msgid "foo"
msgstr "bar"
msgstr "bar"
msgid "bar"
msgstr "foo"