bug #44350 [Translation] Fix TranslationTrait (Tomasz Kusy)

derrabus · derrabus · commit f35720e4087b · 2021-12-05T21:22:47.000+01:00
This PR was merged into the 5.3 branch. Discussion ---------- [Translation] Fix TranslationTrait | Q | A | ------------- | --- | Branch? | 5.3 | Bug fix? | yes | New feature? |no | Deprecations? | no | Tickets | Fix #44185 | License | MIT Commits ------- 62581a9 Fix TranslationTrait for multiple domains
diff --git a/src/Symfony/Component/Translation/Command/TranslationTrait.php b/src/Symfony/Component/Translation/Command/TranslationTrait.php
@@ -32,8 +32,7 @@ private function readLocalTranslations(array $locales, array $domains, array $tr
 
             if ($domains) {
                 foreach ($domains as $domain) {
-                    $catalogue = $this->filterCatalogue($catalogue, $domain);
-                    $bag->addCatalogue($catalogue);
+                    $bag->addCatalogue($this->filterCatalogue($catalogue, $domain));
                 }
             } else {
                 $bag->addCatalogue($catalogue);
diff --git a/src/Symfony/Component/Translation/Tests/Command/TranslationPullCommandTest.php b/src/Symfony/Component/Translation/Tests/Command/TranslationPullCommandTest.php
@@ -424,6 +424,83 @@ public function testPullMessagesWithDefaultLocale()
             , file_get_contents($filenameFr));
     }
 
+    public function testPullMessagesMultipleDomains()
+    {
+        $arrayLoader = new ArrayLoader();
+        $filenameMessages = $this->createFile(['note' => 'NOTE']);
+        $filenameDomain = $this->createFile(['note' => 'NOTE'], 'en', 'domain.%locale%.xlf');
+        $locales = ['en'];
+        $domains = ['messages', 'domain'];
+
+        $providerReadTranslatorBag = new TranslatorBag();
+        $providerReadTranslatorBag->addCatalogue($arrayLoader->load([
+            'new.foo' => 'newFoo',
+        ], 'en'));
+
+        $providerReadTranslatorBag->addCatalogue($arrayLoader->load([
+            'new.foo' => 'newFoo',
+        ], 'en',
+            'domain'
+        ));
+
+        $provider = $this->createMock(ProviderInterface::class);
+        $provider->expects($this->once())
+            ->method('read')
+            ->with($domains, $locales)
+            ->willReturn($providerReadTranslatorBag);
+
+        $provider->expects($this->once())
+            ->method('__toString')
+            ->willReturn('null://default');
+
+        $tester = $this->createCommandTester($provider, $locales, $domains, 'en');
+        $tester->execute(['--locales' => ['en'], '--domains' => ['messages', 'domain']]);
+
+        $this->assertStringContainsString('[OK] New translations from "null" has been written locally (for "en" locale(s), and "messages, domain" domain(s)).', trim($tester->getDisplay()));
+        $this->assertXmlStringEqualsXmlString(<<<XLIFF
+<?xml version="1.0"?>
+<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
+    <file source-language="en" target-language="en" datatype="plaintext" original="file.ext">
+        <header>
+            <tool tool-id="symfony" tool-name="Symfony"/>
+        </header>
+        <body>
+            <trans-unit id="994ixRL" resname="new.foo">
+                <source>new.foo</source>
+                <target>newFoo</target>
+            </trans-unit>
+            <trans-unit id="7bRlYkK" resname="note">
+                <source>note</source>
+                <target>NOTE</target>
+            </trans-unit>
+        </body>
+    </file>
+</xliff>
+XLIFF
+            , file_get_contents($filenameMessages));
+        $this->assertXmlStringEqualsXmlString(<<<XLIFF
+<?xml version="1.0"?>
+<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
+    <file source-language="en" target-language="en" datatype="plaintext" original="file.ext">
+        <header>
+            <tool tool-id="symfony" tool-name="Symfony"/>
+        </header>
+        <body>
+            <trans-unit id="994ixRL" resname="new.foo">
+                <source>new.foo</source>
+                <target>newFoo</target>
+            </trans-unit>
+            <trans-unit id="7bRlYkK" resname="note">
+                <source>note</source>
+                <target>NOTE</target>
+            </trans-unit>
+        </body>
+    </file>
+</xliff>
+XLIFF
+            , file_get_contents($filenameDomain));
+    }
+
     private function createCommandTester(ProviderInterface $provider, array $locales = ['en'], array $domains = ['messages'], $defaultLocale = 'en'): CommandTester
     {
         $writer = new TranslationWriter();

Original file line number	Diff line number	Diff line change
`@@ -32,8 +32,7 @@ private function readLocalTranslations(array $locales, array $domains, array $tr`
`32`	`32`
`33`	`33`	`if ($domains) {`
`34`	`34`	`foreach ($domains as $domain) {`
`35`		`- $catalogue = $this->filterCatalogue($catalogue, $domain);`
`36`		`- $bag->addCatalogue($catalogue);`
	`35`	`+ $bag->addCatalogue($this->filterCatalogue($catalogue, $domain));`
`37`	`36`	`}`
`38`	`37`	`} else {`
`39`	`38`	`$bag->addCatalogue($catalogue);`