diff --git a/src/Symfony/Component/Translation/CHANGELOG.md b/src/Symfony/Component/Translation/CHANGELOG.md
index eda8f363f9e4f..004cd83ec9abc 100644
--- a/src/Symfony/Component/Translation/CHANGELOG.md
+++ b/src/Symfony/Component/Translation/CHANGELOG.md
@@ -4,6 +4,7 @@ CHANGELOG
5.2.0
-----
+ * added support for calling `trans` with ICU formatted messages
* added `PseudoLocalizationTranslator`
5.1.0
diff --git a/src/Symfony/Component/Translation/Tests/TranslatorTest.php b/src/Symfony/Component/Translation/Tests/TranslatorTest.php
index 72a4f9055a378..2d2e5e40df8a7 100644
--- a/src/Symfony/Component/Translation/Tests/TranslatorTest.php
+++ b/src/Symfony/Component/Translation/Tests/TranslatorTest.php
@@ -368,6 +368,14 @@ public function testTrans($expected, $id, $translation, $parameters, $locale, $d
$this->assertEquals($expected, $translator->trans($id, $parameters, $domain, $locale));
}
+ /**
+ * @dataProvider getTransICUTests
+ */
+ public function testTransICU(...$args)
+ {
+ $this->testTrans(...$args);
+ }
+
/**
* @dataProvider getInvalidLocalesTests
*/
@@ -444,6 +452,17 @@ public function getTransTests()
];
}
+ public function getTransICUTests()
+ {
+ $id = '{apples, plural, =0 {There are no apples} one {There is one apple} other {There are # apples}}';
+
+ return [
+ ['There are no apples', $id, $id, ['{apples}' => 0], 'en', 'test'.MessageCatalogue::INTL_DOMAIN_SUFFIX],
+ ['There is one apple', $id, $id, ['{apples}' => 1], 'en', 'test'.MessageCatalogue::INTL_DOMAIN_SUFFIX],
+ ['There are 3 apples', $id, $id, ['{apples}' => 3], 'en', 'test'.MessageCatalogue::INTL_DOMAIN_SUFFIX],
+ ];
+ }
+
public function getFlattenedTransTests()
{
$messages = [
diff --git a/src/Symfony/Component/Translation/Translator.php b/src/Symfony/Component/Translation/Translator.php
index c92abf1383f25..6b1f3985be333 100644
--- 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)) {
+ $len = \strlen(MessageCatalogue::INTL_DOMAIN_SUFFIX);
+ if ($this->hasIntlFormatter
+ && ($catalogue->defines($id, $domain.MessageCatalogue::INTL_DOMAIN_SUFFIX)
+ || 0 == substr_compare($domain, MessageCatalogue::INTL_DOMAIN_SUFFIX, -$len, $len))) {
return $this->formatter->formatIntl($catalogue->get($id, $domain), $locale, $parameters);
}
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy