[Translation] Fix for translation:update command updating ICU messages

artemoliynyk · nicolas-grekas · commit 567cee5f02d1 · 2020-04-30T20:05:09.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php
@@ -356,7 +356,14 @@ private function filterCatalogue(MessageCatalogue $catalogue, string $domain): M
     {
         $filteredCatalogue = new MessageCatalogue($catalogue->getLocale());
 
-        if ($messages = $catalogue->all($domain)) {
+        // extract intl-icu messages only
+        $intlDomain = $domain.MessageCatalogueInterface::INTL_DOMAIN_SUFFIX;
+        if ($intlMessages = $catalogue->all($intlDomain)) {
+            $filteredCatalogue->add($intlMessages, $intlDomain);
+        }
+
+        // extract all messages and subtract intl-icu messages
+        if ($messages = array_diff($catalogue->all($domain), $intlMessages)) {
             $filteredCatalogue->add($messages, $domain);
         }
         foreach ($catalogue->getResources() as $resource) {
diff --git a/src/Symfony/Component/Translation/MessageCatalogue.php b/src/Symfony/Component/Translation/MessageCatalogue.php
@@ -72,6 +72,11 @@ public function getDomains()
     public function all($domain = null)
     {
         if (null !== $domain) {
+            // skip messages merge if intl-icu requested explicitly
+            if (false !== strpos($domain, self::INTL_DOMAIN_SUFFIX)) {
+                return $this->messages[$domain] ?? [];
+            }
+
             return ($this->messages[$domain.self::INTL_DOMAIN_SUFFIX] ?? []) + ($this->messages[$domain] ?? []);
         }
 
diff --git a/src/Symfony/Component/Translation/Tests/MessageCatalogueTest.php b/src/Symfony/Component/Translation/Tests/MessageCatalogueTest.php
@@ -67,6 +67,30 @@ public function testAll()
         $this->assertEquals($messages, $catalogue->all());
     }
 
+    public function testAllIntICU()
+    {
+        $messages = [
+            'domain1+intl-icu' => ['foo' => 'bar'],
+            'domain2+intl-icu' => ['bar' => 'foo'],
+            'domain2' => ['biz' => 'biz'],
+        ];
+        $catalogue = new MessageCatalogue('en', $messages);
+
+        // separated domains
+        $this->assertSame(['foo' => 'bar'], $catalogue->all('domain1+intl-icu'));
+        $this->assertSame(['bar' => 'foo'], $catalogue->all('domain2+intl-icu'));
+
+        // merged, intl-icu ignored
+        $this->assertSame(['bar' => 'foo', 'biz' => 'biz'], $catalogue->all('domain2'));
+
+        // intl-icu ignored
+        $messagesExpected = [
+            'domain1' => ['foo' => 'bar'],
+            'domain2' => ['bar' => 'foo', 'biz' => 'biz'],
+        ];
+        $this->assertSame($messagesExpected, $catalogue->all());
+    }
+
     public function testHas()
     {
         $catalogue = new MessageCatalogue('en', ['domain1' => ['foo' => 'foo'], 'domain2+intl-icu' => ['bar' => 'bar']]);

Original file line number	Diff line number	Diff line change
`@@ -72,6 +72,11 @@ public function getDomains()`
`72`	`72`	`public function all($domain = null)`
`73`	`73`	`{`
`74`	`74`	`if (null !== $domain) {`
	`75`	`+ // skip messages merge if intl-icu requested explicitly`
	`76`	`+ if (false !== strpos($domain, self::INTL_DOMAIN_SUFFIX)) {`
	`77`	`+ return $this->messages[$domain] ?? [];`
	`78`	`+ }`
	`79`	`+`
`75`	`80`	`return ($this->messages[$domain.self::INTL_DOMAIN_SUFFIX] ?? []) + ($this->messages[$domain] ?? []);`
`76`	`81`	`}`
`77`	`82`