[Translator] Fix translator overlapse

Xavier RENAUDIN · Xavier RENAUDIN · commit 0fcdc411adfd · 2022-04-27T14:54:44.000+02:00
diff --git a/src/Symfony/Component/Translation/Tests/TranslatorTest.php b/src/Symfony/Component/Translation/Tests/TranslatorTest.php
@@ -683,6 +683,20 @@ public function testIntlFormattedDomain()
         $this->assertSame('Hi Bob', $translator->trans('some_message', ['%name%' => 'Bob']));
     }
 
+    /**
+     * @requires extension intl
+     */
+    public function testIntlDomainOverlapse()
+    {
+        $translator = new Translator('en');
+        $translator->addLoader('array', new ArrayLoader());
+
+        $translator->addResource('array', ['some_message' => 'hello'], 'en', 'messages');
+        $translator->addResource('array', ['some_message' => 'hello intl'], 'en', 'messages+intl-icu');
+
+        $this->assertSame('hello intl', $translator->trans('some_message', [], 'messages'));
+    }
+
     /**
      * @group legacy
      */
diff --git a/src/Symfony/Component/Translation/Translator.php b/src/Symfony/Component/Translation/Translator.php
@@ -232,7 +232,7 @@ public function trans($id, array $parameters = [], $domain = null, $locale = nul
         }
 
         if ($this->hasIntlFormatter && $catalogue->defines($id, $domain.MessageCatalogue::INTL_DOMAIN_SUFFIX)) {
-            return $this->formatter->formatIntl($catalogue->get($id, $domain), $locale, $parameters);
+            return $this->formatter->formatIntl($catalogue->get($id, $domain.MessageCatalogue::INTL_DOMAIN_SUFFIX), $locale, $parameters);
         }
 
         return $this->formatter->format($catalogue->get($id, $domain), $locale, $parameters);

Original file line number	Diff line number	Diff line change
`@@ -232,7 +232,7 @@ public function trans($id, array $parameters = [], $domain = null, $locale = nul`
`232`	`232`	`}`
`233`	`233`
`234`	`234`	`if ($this->hasIntlFormatter && $catalogue->defines($id, $domain.MessageCatalogue::INTL_DOMAIN_SUFFIX)) {`
`235`		`- return $this->formatter->formatIntl($catalogue->get($id, $domain), $locale, $parameters);`
	`235`	`+ return $this->formatter->formatIntl($catalogue->get($id, $domain.MessageCatalogue::INTL_DOMAIN_SUFFIX), $locale, $parameters);`
`236`	`236`	`}`
`237`	`237`
`238`	`238`	`return $this->formatter->format($catalogue->get($id, $domain), $locale, $parameters);`