merge translation parameters with value configured for parent form
This commit is contained in:
parent
d8e36f2940
commit
3de453c368
@ -185,14 +185,16 @@ class ViolationMapper implements ViolationMapperInterface
|
|||||||
|
|
||||||
if (null !== $this->translator) {
|
if (null !== $this->translator) {
|
||||||
$form = $scope;
|
$form = $scope;
|
||||||
|
$translationParameters = $form->getConfig()->getOption('label_translation_parameters', []);
|
||||||
|
|
||||||
do {
|
do {
|
||||||
$translationDomain = $form->getConfig()->getOption('translation_domain');
|
$translationDomain = $form->getConfig()->getOption('translation_domain');
|
||||||
|
$translationParameters = array_merge($form->getConfig()->getOption('label_translation_parameters', []), $translationParameters);
|
||||||
} while (null === $translationDomain && null !== $form = $form->getParent());
|
} while (null === $translationDomain && null !== $form = $form->getParent());
|
||||||
|
|
||||||
$label = $this->translator->trans(
|
$label = $this->translator->trans(
|
||||||
$label,
|
$label,
|
||||||
$scope->getConfig()->getOption('label_translation_parameters', []),
|
$translationParameters,
|
||||||
$translationDomain
|
$translationDomain
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
@ -1786,6 +1786,44 @@ class ViolationMapperTest extends TestCase
|
|||||||
$this->assertSame('Message "translated foo label"', $errors[0]->getMessage());
|
$this->assertSame('Message "translated foo label"', $errors[0]->getMessage());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function testLabelPlaceholderTranslatedWithTranslationParametersMergedFromParentForm()
|
||||||
|
{
|
||||||
|
$translator = $this->createMock(TranslatorInterface::class);
|
||||||
|
$translator->expects($this->any())
|
||||||
|
->method('trans')
|
||||||
|
->with('foo', [
|
||||||
|
'{{ param_defined_in_parent }}' => 'param defined in parent value',
|
||||||
|
'{{ param_defined_in_child }}' => 'param defined in child value',
|
||||||
|
'{{ param_defined_in_parent_overridden_in_child }}' => 'param defined in parent overridden in child child value',
|
||||||
|
])
|
||||||
|
->willReturn('translated foo label')
|
||||||
|
;
|
||||||
|
$this->mapper = new ViolationMapper(null, $translator);
|
||||||
|
|
||||||
|
$form = $this->getForm('', null, null, [], false, true, [
|
||||||
|
'label_translation_parameters' => [
|
||||||
|
'{{ param_defined_in_parent }}' => 'param defined in parent value',
|
||||||
|
'{{ param_defined_in_parent_overridden_in_child }}' => 'param defined in parent overridden in child parent value',
|
||||||
|
],
|
||||||
|
]);
|
||||||
|
$child = $this->getForm('foo', 'foo', null, [], false, true, [
|
||||||
|
'label' => 'foo',
|
||||||
|
'label_translation_parameters' => [
|
||||||
|
'{{ param_defined_in_child }}' => 'param defined in child value',
|
||||||
|
'{{ param_defined_in_parent_overridden_in_child }}' => 'param defined in parent overridden in child child value',
|
||||||
|
],
|
||||||
|
]);
|
||||||
|
$form->add($child);
|
||||||
|
|
||||||
|
$violation = new ConstraintViolation('Message "{{ label }}"', null, [], null, 'data.foo', null);
|
||||||
|
$this->mapper->mapViolation($violation, $form);
|
||||||
|
|
||||||
|
$errors = iterator_to_array($child->getErrors());
|
||||||
|
|
||||||
|
$this->assertCount(1, $errors, $child->getName().' should have an error, but has none');
|
||||||
|
$this->assertSame('Message "translated foo label"', $errors[0]->getMessage());
|
||||||
|
}
|
||||||
|
|
||||||
public function testTranslatorNotCalledWithoutLabel()
|
public function testTranslatorNotCalledWithoutLabel()
|
||||||
{
|
{
|
||||||
$renderer = $this->getMockBuilder(FormRenderer::class)
|
$renderer = $this->getMockBuilder(FormRenderer::class)
|
||||||
|
Reference in New Issue
Block a user