[Translation] Translate translatable parameters

kylekatarnls · fabpot · commit a31dff429cf1 · 2021-09-10T09:32:09.000+02:00
diff --git a/src/Symfony/Component/Translation/Tests/TranslatableTest.php b/src/Symfony/Component/Translation/Tests/TranslatableTest.php
@@ -21,11 +21,11 @@ class TranslatableTest extends TestCase
     /**
      * @dataProvider getTransTests
      */
-    public function testTrans($expected, $translatable, $translation, $locale)
+    public function testTrans(string $expected, TranslatableMessage $translatable, array $translation, string $locale)
     {
         $translator = new Translator('en');
         $translator->addLoader('array', new ArrayLoader());
-        $translator->addResource('array', [$translatable->getMessage() => $translation], $locale, $translatable->getDomain());
+        $translator->addResource('array', $translation, $locale, $translatable->getDomain());
 
         $this->assertSame($expected, $translatable->trans($translator, $locale));
     }
@@ -50,8 +50,16 @@ public function testToString()
     public function getTransTests()
     {
         return [
-            ['Symfony est super !', new TranslatableMessage('Symfony is great!', [], ''), 'Symfony est super !', 'fr'],
-            ['Symfony est awesome !', new TranslatableMessage('Symfony is %what%!', ['%what%' => 'awesome'], ''), 'Symfony est %what% !', 'fr'],
+            ['Symfony est super !', new TranslatableMessage('Symfony is great!', [], ''), [
+                'Symfony is great!' => 'Symfony est super !',
+            ], 'fr'],
+            ['Symfony est awesome !', new TranslatableMessage('Symfony is %what%!', ['%what%' => 'awesome'], ''), [
+                'Symfony is %what%!' => 'Symfony est %what% !',
+            ], 'fr'],
+            ['Symfony est superbe !', new TranslatableMessage('Symfony is %what%!', ['%what%' => new TranslatableMessage('awesome', [], '')], ''), [
+                'Symfony is %what%!' => 'Symfony est %what% !',
+                'awesome' => 'superbe',
+            ], 'fr'],
         ];
     }
 
diff --git a/src/Symfony/Component/Translation/TranslatableMessage.php b/src/Symfony/Component/Translation/TranslatableMessage.php
@@ -52,6 +52,11 @@ public function getDomain(): ?string
 
     public function trans(TranslatorInterface $translator, string $locale = null): string
     {
-        return $translator->trans($this->getMessage(), $this->getParameters(), $this->getDomain(), $locale);
+        return $translator->trans($this->getMessage(), array_map(
+            static function ($parameter) use ($translator, $locale) {
+                return $parameter instanceof TranslatableInterface ? $parameter->trans($translator, $locale) : $parameter;
+            },
+            $this->getParameters()
+        ), $this->getDomain(), $locale);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,11 @@ public function getDomain(): ?string`
`52`	`52`
`53`	`53`	`public function trans(TranslatorInterface $translator, string $locale = null): string`
`54`	`54`	`{`
`55`		`- return $translator->trans($this->getMessage(), $this->getParameters(), $this->getDomain(), $locale);`
	`55`	`+ return $translator->trans($this->getMessage(), array_map(`
	`56`	`+ static function ($parameter) use ($translator, $locale) {`
	`57`	`+ return $parameter instanceof TranslatableInterface ? $parameter->trans($translator, $locale) : $parameter;`
	`58`	`+ },`
	`59`	`+ $this->getParameters()`
	`60`	`+ ), $this->getDomain(), $locale);`
`56`	`61`	`}`
`57`	`62`	`}`