Skip to content

[TwigBridge] Fixed a parameterized choice label translation #58395

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 28, 2024
Merged

[TwigBridge] Fixed a parameterized choice label translation #58395

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
12 changes: 8 additions & 4 deletions src/Symfony/Bridge/Twig/Extension/FormExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
use Symfony\Component\Form\FormError;
use Symfony\Component\Form\FormRenderer;
use Symfony\Component\Form\FormView;
use Symfony\Contracts\Translation\TranslatableInterface;
use Symfony\Contracts\Translation\TranslatorInterface;
use Twig\Extension\AbstractExtension;
use Twig\TwigFilter;
Expand Down Expand Up @@ -149,23 +150,26 @@ public function getFieldChoices(FormView $view): iterable
private function createFieldChoicesList(iterable $choices, string|false|null $translationDomain): iterable
{
foreach ($choices as $choice) {
$translatableLabel = $this->createFieldTranslation($choice->label, [], $translationDomain);

if ($choice instanceof ChoiceGroupView) {
$translatableLabel = $this->createFieldTranslation($choice->label, [], $translationDomain);
yield $translatableLabel => $this->createFieldChoicesList($choice, $translationDomain);

continue;
}

/* @var ChoiceView $choice */
$translatableLabel = $this->createFieldTranslation($choice->label, $choice->labelTranslationParameters, $translationDomain);
yield $translatableLabel => $choice->value;
}
}

private function createFieldTranslation(?string $value, array $parameters, string|false|null $domain): ?string
private function createFieldTranslation(TranslatableInterface|string|null $value, array $parameters, string|false|null $domain): ?string
{
if (!$this->translator || !$value || false === $domain) {
return $value;
return null !== $value ? (string) $value : null;
}
if ($value instanceof TranslatableInterface) {
return $value->trans($this->translator);
}

return $this->translator->trans($value, $parameters, $domain);
Expand Down
59 changes: 59 additions & 0 deletions src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionFieldHelpersTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
use Symfony\Component\Form\FormError;
use Symfony\Component\Form\FormView;
use Symfony\Component\Form\Test\FormIntegrationTestCase;
use Symfony\Component\Translation\TranslatableMessage;

class FormExtensionFieldHelpersTest extends FormIntegrationTestCase
{
Expand Down Expand Up @@ -81,6 +82,28 @@ protected function setUp(): void
'expanded' => true,
'label' => false,
])
->add('parametrized_choice_label', ChoiceType::class, [
'choices' => [
(object) ['value' => 'yes', 'label' => 'parametrized.%yes%'],
(object) ['value' => 'no', 'label' => 'parametrized.%no%'],
],
'choice_value' => 'value',
'choice_label' => 'label',
'choice_translation_domain' => 'forms',
'choice_translation_parameters' => [
['%yes%' => 'YES'],
['%no%' => 'NO'],
],
])
->add('translatable_choice_label', ChoiceType::class, [
'choices' => [
'yes',
'no',
],
'choice_label' => static function (string $choice) {
return new TranslatableMessage('parametrized.%value%', ['%value%' => $choice], 'forms');
},
])
->getForm()
;

Expand Down Expand Up @@ -290,4 +313,40 @@ public function testFieldTranslatedChoicesMultiple()
$this->assertSame('salt', $choicesArray[1]['value']);
$this->assertSame('[trans]base.salt[/trans]', $choicesArray[1]['label']);
}

public function testChoiceParametrizedLabel()
{
$choices = $this->translatorExtension->getFieldChoices($this->view->children['parametrized_choice_label']);

$choicesArray = [];
foreach ($choices as $label => $value) {
$choicesArray[] = ['label' => $label, 'value' => $value];
}

$this->assertCount(2, $choicesArray);

$this->assertSame('yes', $choicesArray[0]['value']);
$this->assertSame('[trans]parametrized.YES[/trans]', $choicesArray[0]['label']);

$this->assertSame('no', $choicesArray[1]['value']);
$this->assertSame('[trans]parametrized.NO[/trans]', $choicesArray[1]['label']);
}

public function testChoiceTranslatableLabel()
{
$choices = $this->translatorExtension->getFieldChoices($this->view->children['translatable_choice_label']);

$choicesArray = [];
foreach ($choices as $label => $value) {
$choicesArray[] = ['label' => $label, 'value' => $value];
}

$this->assertCount(2, $choicesArray);

$this->assertSame('yes', $choicesArray[0]['value']);
$this->assertSame('[trans]parametrized.yes[/trans]', $choicesArray[0]['label']);

$this->assertSame('no', $choicesArray[1]['value']);
$this->assertSame('[trans]parametrized.no[/trans]', $choicesArray[1]['label']);
}
}
Loading