Skip to content

Commit 220cb4f

Browse files
committed
feature #28635 [Form] Add label_translation_parameters, help_translation_parameters and attr_translation_parameters options to base form type (webnet-fr)
This PR was squashed before being merged into the 4.3-dev branch (closes #28635). Discussion ---------- [Form] Add label_translation_parameters, help_translation_parameters and attr_translation_parameters options to base form type | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | yes | BC breaks? | no | Deprecations? | no | Tests pass? | yes. Travis-ci isn't green because it tests the components separately. Fabbot.io requires license headers in files where they were not present before. | Fixed tickets | #27698 | License | MIT | Doc PR | symfony/symfony-docs#10065 Hi, this is an alternative to #27775. `translation_parameters` is separated to `label_translation_parameters`, `help_translation_parameters`, `attr_translation_parameters`. Commits ------- b3f3c5361f [Form] Add label_translation_parameters, help_translation_parameters and attr_translation_parameters options to base form type
2 parents 27ba74b + b340ad2 commit 220cb4f

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

Resources/views/Form/attributes.html.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php foreach ($attr as $k => $v): ?>
22
<?php if ('placeholder' === $k || 'title' === $k): ?>
3-
<?php printf('%s="%s" ', $view->escape($k), $view->escape(false !== $translation_domain ? $view['translator']->trans($v, [], $translation_domain) : $v)) ?>
3+
<?php printf('%s="%s" ', $view->escape($k), $view->escape(false !== $translation_domain ? $view['translator']->trans($v, $attr_translation_parameters, $translation_domain) : $v)) ?>
44
<?php elseif (true === $v): ?>
55
<?php printf('%s="%s" ', $view->escape($k), $view->escape($k)) ?>
66
<?php elseif (false !== $v): ?>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?php if (!$label) { $label = isset($label_format)
22
? strtr($label_format, ['%name%' => $name, '%id%' => $id])
33
: $view['form']->humanize($name); } ?>
4-
<button type="<?php echo isset($type) ? $view->escape($type) : 'button' ?>" <?php echo $view['form']->block($form, 'button_attributes') ?>><?php echo $view->escape(false !== $translation_domain ? $view['translator']->trans($label, [], $translation_domain) : $label) ?></button>
4+
<button type="<?php echo isset($type) ? $view->escape($type) : 'button' ?>" <?php echo $view['form']->block($form, 'button_attributes') ?>><?php echo $view->escape(false !== $translation_domain ? $view['translator']->trans($label, $label_translation_parameters, $translation_domain) : $label) ?></button>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php if (!empty($help)): ?>
22
<?php $help_attr['class'] = isset($help_attr['class']) ? trim($help_attr['class'].' help-text') : 'help-text'; ?>
3-
<?php $help = false !== $translation_domain ? $view['translator']->trans($help, [], $translation_domain) : $help; ?>
3+
<?php $help = false !== $translation_domain ? $view['translator']->trans($help, $help_translation_parameters, $translation_domain) : $help; ?>
44
<?php $help = false === $help_html ? $view->escape($help) : $help ?>
55
<p id="<?php echo $view->escape($id); ?>_help" <?php echo ' '.$view['form']->block($form, 'attributes', ['attr' => $help_attr]); ?>><?php echo $help; ?></p>
66
<?php endif; ?>

Resources/views/Form/form_label.html.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
<?php if (!$label) { $label = isset($label_format)
55
? strtr($label_format, ['%name%' => $name, '%id%' => $id])
66
: $view['form']->humanize($name); } ?>
7-
<label<?php if ($label_attr) { echo ' '.$view['form']->block($form, 'attributes', ['attr' => $label_attr]); } ?>><?php echo $view->escape(false !== $translation_domain ? $view['translator']->trans($label, [], $translation_domain) : $label) ?></label>
7+
<label<?php if ($label_attr) { echo ' '.$view['form']->block($form, 'attributes', ['attr' => $label_attr]); } ?>><?php echo $view->escape(false !== $translation_domain ? $view['translator']->trans($label, $label_translation_parameters, $translation_domain) : $label) ?></label>
88
<?php endif ?>

Tests/Templating/Helper/Fixtures/StubTranslator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ class StubTranslator implements TranslatorInterface
1717
{
1818
public function trans($id, array $parameters = [], $domain = null, $locale = null)
1919
{
20-
return '[trans]'.$id.'[/trans]';
20+
return '[trans]'.strtr($id, $parameters).'[/trans]';
2121
}
2222
}

0 commit comments

Comments
 (0)