bar" => "foo
bar
"
*
* * localizable_html_attributes:
diff --git a/symfony/translation/Resources/data/parents.json b/symfony/translation/Resources/data/parents.json
index 24d4d119e..0197e451b 100644
--- a/symfony/translation/Resources/data/parents.json
+++ b/symfony/translation/Resources/data/parents.json
@@ -18,29 +18,37 @@
"en_CM": "en_001",
"en_CX": "en_001",
"en_CY": "en_001",
+ "en_CZ": "en_150",
"en_DE": "en_150",
"en_DG": "en_001",
"en_DK": "en_150",
"en_DM": "en_001",
+ "en_EE": "en_150",
"en_ER": "en_001",
+ "en_ES": "en_150",
"en_FI": "en_150",
"en_FJ": "en_001",
"en_FK": "en_001",
"en_FM": "en_001",
+ "en_FR": "en_150",
"en_GB": "en_001",
"en_GD": "en_001",
+ "en_GE": "en_150",
"en_GG": "en_001",
"en_GH": "en_001",
"en_GI": "en_001",
"en_GM": "en_001",
+ "en_GS": "en_001",
"en_GY": "en_001",
"en_HK": "en_001",
+ "en_HU": "en_150",
"en_ID": "en_001",
"en_IE": "en_001",
"en_IL": "en_001",
"en_IM": "en_001",
"en_IN": "en_001",
"en_IO": "en_001",
+ "en_IT": "en_150",
"en_JE": "en_001",
"en_JM": "en_001",
"en_KE": "en_001",
@@ -50,6 +58,8 @@
"en_LC": "en_001",
"en_LR": "en_001",
"en_LS": "en_001",
+ "en_LT": "en_150",
+ "en_LV": "en_150",
"en_MG": "en_001",
"en_MO": "en_001",
"en_MS": "en_001",
@@ -62,13 +72,17 @@
"en_NF": "en_001",
"en_NG": "en_001",
"en_NL": "en_150",
+ "en_NO": "en_150",
"en_NR": "en_001",
"en_NU": "en_001",
"en_NZ": "en_001",
"en_PG": "en_001",
"en_PK": "en_001",
+ "en_PL": "en_150",
"en_PN": "en_001",
+ "en_PT": "en_150",
"en_PW": "en_001",
+ "en_RO": "en_150",
"en_RW": "en_001",
"en_SB": "en_001",
"en_SC": "en_001",
@@ -77,6 +91,7 @@
"en_SG": "en_001",
"en_SH": "en_001",
"en_SI": "en_150",
+ "en_SK": "en_150",
"en_SL": "en_001",
"en_SS": "en_001",
"en_SX": "en_001",
@@ -87,6 +102,7 @@
"en_TT": "en_001",
"en_TV": "en_001",
"en_TZ": "en_001",
+ "en_UA": "en_150",
"en_UG": "en_001",
"en_VC": "en_001",
"en_VG": "en_001",
@@ -119,6 +135,7 @@
"es_VE": "es_419",
"ff_Adlm": "root",
"hi_Latn": "en_IN",
+ "kk_Arab": "root",
"ks_Deva": "root",
"nb": "no",
"nn": "no",
diff --git a/symfony/translation/TranslatableMessage.php b/symfony/translation/TranslatableMessage.php
index c591e68c2..8f6063c50 100644
--- a/symfony/translation/TranslatableMessage.php
+++ b/symfony/translation/TranslatableMessage.php
@@ -52,9 +52,13 @@ public function getDomain(): ?string
public function trans(TranslatorInterface $translator, ?string $locale = null): string
{
- return $translator->trans($this->getMessage(), array_map(
- static fn ($parameter) => $parameter instanceof TranslatableInterface ? $parameter->trans($translator, $locale) : $parameter,
- $this->getParameters()
- ), $this->getDomain(), $locale);
+ $parameters = $this->getParameters();
+ foreach ($parameters as $k => $v) {
+ if ($v instanceof TranslatableInterface) {
+ $parameters[$k] = $v->trans($translator, $locale);
+ }
+ }
+
+ return $translator->trans($this->getMessage(), $parameters, $this->getDomain(), $locale);
}
}
diff --git a/symfony/translation/Translator.php b/symfony/translation/Translator.php
index 1973d079f..d3396c515 100644
--- a/symfony/translation/Translator.php
+++ b/symfony/translation/Translator.php
@@ -290,7 +290,7 @@ private function dumpCatalogue(string $locale, ConfigCacheInterface $cache): voi
$this->initializeCatalogue($locale);
$fallbackContent = $this->getFallbackContent($this->catalogues[$locale]);
- $content = sprintf(<<
addFallbackCatalogue($catalogue%s);
@@ -356,10 +356,10 @@ protected function doLoadCatalogue(string $locale): void
foreach ($this->resources[$locale] as $resource) {
if (!isset($this->loaders[$resource[0]])) {
if (\is_string($resource[1])) {
- throw new RuntimeException(sprintf('No loader is registered for the "%s" format when loading the "%s" resource.', $resource[0], $resource[1]));
+ throw new RuntimeException(\sprintf('No loader is registered for the "%s" format when loading the "%s" resource.', $resource[0], $resource[1]));
}
- throw new RuntimeException(sprintf('No loader is registered for the "%s" format.', $resource[0]));
+ throw new RuntimeException(\sprintf('No loader is registered for the "%s" format.', $resource[0]));
}
$this->catalogues[$locale]->addCatalogue($this->loaders[$resource[0]]->load($resource[1], $locale, $resource[2]));
}
@@ -438,7 +438,7 @@ protected function computeFallbackLocales(string $locale)
protected function assertValidLocale(string $locale)
{
if (!preg_match('/^[a-z0-9@_\\.\\-]*$/i', $locale)) {
- throw new InvalidArgumentException(sprintf('Invalid "%s" locale.', $locale));
+ throw new InvalidArgumentException(\sprintf('Invalid "%s" locale.', $locale));
}
}
diff --git a/symfony/translation/Util/XliffUtils.php b/symfony/translation/Util/XliffUtils.php
index 335c34beb..e76e12284 100644
--- a/symfony/translation/Util/XliffUtils.php
+++ b/symfony/translation/Util/XliffUtils.php
@@ -41,7 +41,7 @@ public static function getVersionNumber(\DOMDocument $dom): string
$namespace = $xliff->attributes->getNamedItem('xmlns');
if ($namespace) {
if (0 !== substr_compare('urn:oasis:names:tc:xliff:document:', $namespace->nodeValue, 0, 34)) {
- throw new InvalidArgumentException(sprintf('Not a valid XLIFF namespace "%s".', $namespace));
+ throw new InvalidArgumentException(\sprintf('Not a valid XLIFF namespace "%s".', $namespace));
}
return substr($namespace, 34);
@@ -113,7 +113,7 @@ public static function getErrorsAsString(array $xmlErrors): string
$errorsAsString = '';
foreach ($xmlErrors as $error) {
- $errorsAsString .= sprintf("[%s %s] %s (in %s - line %d, column %d)\n",
+ $errorsAsString .= \sprintf("[%s %s] %s (in %s - line %d, column %d)\n",
\LIBXML_ERR_WARNING === $error['level'] ? 'WARNING' : 'ERROR',
$error['code'],
$error['message'],
@@ -135,7 +135,7 @@ private static function getSchema(string $xliffVersion): string
$schemaSource = file_get_contents(__DIR__.'/../Resources/schemas/xliff-core-2.0.xsd');
$xmlUri = 'informativeCopiesOf3rdPartySchemas/w3c/xml.xsd';
} else {
- throw new InvalidArgumentException(sprintf('No support implemented for loading XLIFF version "%s".', $xliffVersion));
+ throw new InvalidArgumentException(\sprintf('No support implemented for loading XLIFF version "%s".', $xliffVersion));
}
return self::fixXmlLocation($schemaSource, $xmlUri);
diff --git a/symfony/translation/Writer/TranslationWriter.php b/symfony/translation/Writer/TranslationWriter.php
index 61e03cb0e..464a83c5b 100644
--- a/symfony/translation/Writer/TranslationWriter.php
+++ b/symfony/translation/Writer/TranslationWriter.php
@@ -59,14 +59,14 @@ public function getFormats(): array
public function write(MessageCatalogue $catalogue, string $format, array $options = [])
{
if (!isset($this->dumpers[$format])) {
- throw new InvalidArgumentException(sprintf('There is no dumper associated with format "%s".', $format));
+ throw new InvalidArgumentException(\sprintf('There is no dumper associated with format "%s".', $format));
}
// get the right dumper
$dumper = $this->dumpers[$format];
if (isset($options['path']) && !is_dir($options['path']) && !@mkdir($options['path'], 0777, true) && !is_dir($options['path'])) {
- throw new RuntimeException(sprintf('Translation Writer was not able to create directory "%s".', $options['path']));
+ throw new RuntimeException(\sprintf('Translation Writer was not able to create directory "%s".', $options['path']));
}
// save