Add support for calling 'trans' with ICU formatted messages

someonewithpc · someonewithpc · commit 8254128efe2b · 2020-06-21T15:25:33.000Z
diff --git a/src/Symfony/Component/Translation/CHANGELOG.md b/src/Symfony/Component/Translation/CHANGELOG.md
@@ -4,6 +4,7 @@ CHANGELOG
 5.1.0
 -----
 
+ * added support for calling `trans` with ICU formatted messages
  * added support for `name` attribute on `unit` element from xliff2 to be used as a translation key instead of always the `source` element
 
 5.0.0
diff --git a/src/Symfony/Component/Translation/Translator.php b/src/Symfony/Component/Translation/Translator.php
@@ -214,7 +214,10 @@ public function trans(?string $id, array $parameters = [], string $domain = null
             }
         }
 
-        if ($this->hasIntlFormatter && $catalogue->defines($id, $domain.MessageCatalogue::INTL_DOMAIN_SUFFIX)) {
+        if ($this->hasIntlFormatter
+            && ($catalogue->defines($id, $domain.MessageCatalogue::INTL_DOMAIN_SUFFIX)
+                || strstr($domain, MessageCatalogue::INTL_DOMAIN_SUFFIX) != false))
+        {
             return $this->formatter->formatIntl($catalogue->get($id, $domain), $locale, $parameters);
         }
 
@@ -466,7 +469,11 @@ private function getAllMessages(MessageCatalogueInterface $catalogue): array
 
         foreach ($catalogue->all() as $domain => $messages) {
             if ($intlMessages = $catalogue->all($domain.MessageCatalogue::INTL_DOMAIN_SUFFIX)) {
-                $allMessages[$domain.MessageCatalogue::INTL_DOMAIN_SUFFIX] = $intlMessages;
+                if (strstr($domain, MessageCatalogue::INTL_DOMAIN_SUFFIX) === false) {
+                    $domain .= MessageCatalogue::INTL_DOMAIN_SUFFIX;
+                }
+
+                $allMessages[$domain] = $intlMessages;
                 $messages = array_diff_key($messages, $intlMessages);
             }
             if ($messages) {

Original file line number	Diff line number	Diff line change
`@@ -214,7 +214,10 @@ public function trans(?string $id, array $parameters = [], string $domain = null`
`214`	`214`	`}`
`215`	`215`	`}`
`216`	`216`
`217`		`- if ($this->hasIntlFormatter && $catalogue->defines($id, $domain.MessageCatalogue::INTL_DOMAIN_SUFFIX)) {`
	`217`	`+ if ($this->hasIntlFormatter`
	`218`	`+ && ($catalogue->defines($id, $domain.MessageCatalogue::INTL_DOMAIN_SUFFIX)`
	`219`	`+ \|\| strstr($domain, MessageCatalogue::INTL_DOMAIN_SUFFIX) != false))`
	`220`	`+ {`
`218`	`221`	`return $this->formatter->formatIntl($catalogue->get($id, $domain), $locale, $parameters);`
`219`	`222`	`}`
`220`	`223`
`@@ -466,7 +469,11 @@ private function getAllMessages(MessageCatalogueInterface $catalogue): array`
`466`	`469`
`467`	`470`	`foreach ($catalogue->all() as $domain => $messages) {`
`468`	`471`	`if ($intlMessages = $catalogue->all($domain.MessageCatalogue::INTL_DOMAIN_SUFFIX)) {`
`469`		`- $allMessages[$domain.MessageCatalogue::INTL_DOMAIN_SUFFIX] = $intlMessages;`
	`472`	`+ if (strstr($domain, MessageCatalogue::INTL_DOMAIN_SUFFIX) === false) {`
	`473`	`+ $domain .= MessageCatalogue::INTL_DOMAIN_SUFFIX;`
	`474`	`+ }`
	`475`	`+`
	`476`	`+ $allMessages[$domain] = $intlMessages;`
`470`	`477`	`$messages = array_diff_key($messages, $intlMessages);`
`471`	`478`	`}`
`472`	`479`	`if ($messages) {`