Skip to content

Commit 9942bb5

Browse files
committed
feature #38469 [Form] Add "choice_translation_parameters" option (VincentLanglet)
This PR was squashed before being merged into the 5.3-dev branch. Discussion ---------- [Form] Add "choice_translation_parameters" option | Q | A | ------------- | --- | Branch? | 5.x | Bug fix? | no | New feature? | yes <!-- please update src/**/CHANGELOG.md files --> | Deprecations? | no <!-- please update UPGRADE-*.md and src/**/CHANGELOG.md files --> | Tickets | Fix #36845 <!-- prefix each issue number with "Fix #", if any --> | License | MIT | Doc PR | symfony/symfony-docs#13677 Original PR: symfony/symfony#36851 Commits ------- 1ce5b03c2a [Form] Add "choice_translation_parameters" option
2 parents 8d6f3d6 + eb50796 commit 9942bb5

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Resources/views/Form/form_div_layout.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
{{- block('choice_widget_options') -}}
8686
</optgroup>
8787
{%- else -%}
88-
<option value="{{ choice.value }}"{% if choice.attr %}{% with { attr: choice.attr } %}{{ block('attributes') }}{% endwith %}{% endif %}{% if not render_preferred_choices|default(false) and choice is selectedchoice(value) %} selected="selected"{% endif %}>{{ choice_translation_domain is same as(false) ? choice.label : choice.label|trans({}, choice_translation_domain) }}</option>
88+
<option value="{{ choice.value }}"{% if choice.attr %}{% with { attr: choice.attr } %}{{ block('attributes') }}{% endwith %}{% endif %}{% if not render_preferred_choices|default(false) and choice is selectedchoice(value) %} selected="selected"{% endif %}>{{ choice_translation_domain is same as(false) ? choice.label : choice.label|trans(choice.labelTranslationParameters, choice_translation_domain) }}</option>
8989
{%- endif -%}
9090
{% endfor %}
9191
{%- endblock choice_widget_options -%}

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"symfony/asset": "^4.4|^5.0",
2828
"symfony/dependency-injection": "^4.4|^5.0",
2929
"symfony/finder": "^4.4|^5.0",
30-
"symfony/form": "^5.1.9",
30+
"symfony/form": "^5.3",
3131
"symfony/http-foundation": "^4.4|^5.0",
3232
"symfony/http-kernel": "^4.4|^5.0",
3333
"symfony/mime": "^5.2",
@@ -52,7 +52,7 @@
5252
},
5353
"conflict": {
5454
"symfony/console": "<4.4",
55-
"symfony/form": "<5.1",
55+
"symfony/form": "<5.3",
5656
"symfony/http-foundation": "<4.4",
5757
"symfony/http-kernel": "<4.4",
5858
"symfony/translation": "<5.2",

0 commit comments

Comments
 (0)