Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[Translation] Translate translatable parameters #41858

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 10, 2021
Merged

[Translation] Translate translatable parameters #41858

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
[Translation] Translate translatable parameters
  • Loading branch information
@kylekatarnls @fabpot
kylekatarnls authored and fabpot committed Sep 10, 2021
commit a31dff429cf15ff0b81860c61da0a31dc680196c
16 changes: 12 additions & 4 deletions src/Symfony/Component/Translation/Tests/TranslatableTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}
Expand All @@ -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'],
];
}

Expand Down
7 changes: 6 additions & 1 deletion src/Symfony/Component/Translation/TranslatableMessage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}