Skip to content

Commit 6562aec

Browse files
javiereguiluzjaviereguiluz
committed
Merge branch '3.4' into 4.4
* 3.4: fix default value of choice_translation_domain for choice types
2 parents 4e9656a + 38503b1 commit 6562aec

13 files changed

+38
-14
lines changed

‎reference/forms/types/birthday.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ Inherited Options
7272

7373
These options inherit from the :doc:`DateType </reference/forms/types/date>`:
7474

75-
.. include:: /reference/forms/types/options/choice_translation_domain.rst.inc
75+
.. include:: /reference/forms/types/options/choice_translation_domain_disabled.rst.inc
7676

7777
.. include:: /reference/forms/types/options/days.rst.inc
7878

‎reference/forms/types/choice.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ the choice options would need to be resolved thus triggering the callback.
239239

240240
.. include:: /reference/forms/types/options/choice_name.rst.inc
241241

242-
.. include:: /reference/forms/types/options/choice_translation_domain.rst.inc
242+
.. include:: /reference/forms/types/options/choice_translation_domain_enabled.rst.inc
243243

244244
.. include:: /reference/forms/types/options/choice_value.rst.inc
245245

‎reference/forms/types/country.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ the option manually, but then you should just use the ``ChoiceType`` directly.
2525
| | - `choice_translation_locale`_ |
2626
+-------------+-----------------------------------------------------------------------+
2727
| Overridden | - `choices`_ |
28-
| options | |
28+
| options | - `choice_translation_domain`_ |
2929
+-------------+-----------------------------------------------------------------------+
3030
| Inherited | from the :doc:`ChoiceType </reference/forms/types/choice>` |
3131
| options | |
@@ -94,6 +94,8 @@ The locale is used to translate the countries names.
9494
If you want to override the built-in choices of the country type, you
9595
will also have to set the ``choice_loader`` option to ``null``.
9696

97+
.. include:: /reference/forms/types/options/choice_translation_domain_disabled.rst.inc
98+
9799
Inherited Options
98100
-----------------
99101

‎reference/forms/types/currency.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ manually, but then you should just use the ``ChoiceType`` directly.
1717
| Options | - `choice_translation_locale`_ |
1818
+-------------+------------------------------------------------------------------------+
1919
| Overridden | - `choices`_ |
20-
| options | |
20+
| options | - `choice_translation_domain`_ |
2121
+-------------+------------------------------------------------------------------------+
2222
| Inherited | from the :doc:`ChoiceType </reference/forms/types/choice>` |
2323
| options | |
@@ -71,6 +71,8 @@ The choices option defaults to all currencies.
7171
If you want to override the built-in choices of the currency type, you
7272
will also have to set the ``choice_loader`` option to ``null``.
7373

74+
.. include:: /reference/forms/types/options/choice_translation_domain_disabled.rst.inc
75+
7476
Inherited Options
7577
-----------------
7678

‎reference/forms/types/date.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ and can understand a number of different input formats via the `input`_ option.
1515
+----------------------+-----------------------------------------------------------------------------+
1616
| Rendered as | single text box or three select fields |
1717
+----------------------+-----------------------------------------------------------------------------+
18-
| Options | - `choice_translation_domain`_ |
19-
| | - `days`_ |
18+
| Options | - `days`_ |
2019
| | - `placeholder`_ |
2120
| | - `format`_ |
2221
| | - `html5`_ |
@@ -29,6 +28,7 @@ and can understand a number of different input formats via the `input`_ option.
2928
| | - `years`_ |
3029
+----------------------+-----------------------------------------------------------------------------+
3130
| Overridden options | - `by_reference`_ |
31+
| | - `choice_translation_domain`_ |
3232
| | - `compound`_ |
3333
| | - `data_class`_ |
3434
| | - `error_bubbling`_ |
@@ -143,8 +143,6 @@ that Symfony should expect via the `format`_ option.
143143
Field Options
144144
-------------
145145

146-
.. include:: /reference/forms/types/options/choice_translation_domain.rst.inc
147-
148146
.. include:: /reference/forms/types/options/days.rst.inc
149147

150148
``placeholder``
@@ -206,6 +204,8 @@ Overridden Options
206204

207205
The ``DateTime`` classes are treated as immutable objects.
208206

207+
.. include:: /reference/forms/types/options/choice_translation_domain_disabled.rst.inc
208+
209209
.. include:: /reference/forms/types/options/compound_type.rst.inc
210210

211211
.. include:: /reference/forms/types/options/data_class_date.rst.inc

‎reference/forms/types/entity.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ These options inherit from the :doc:`ChoiceType </reference/forms/types/choice>`
273273

274274
.. include:: /reference/forms/types/options/choice_attr.rst.inc
275275

276-
.. include:: /reference/forms/types/options/choice_translation_domain.rst.inc
276+
.. include:: /reference/forms/types/options/choice_translation_domain_disabled.rst.inc
277277

278278
.. include:: /reference/forms/types/options/expanded.rst.inc
279279

‎reference/forms/types/language.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ manually, but then you should just use the ``ChoiceType`` directly.
2727
| | - `choice_translation_locale`_ |
2828
+-------------+------------------------------------------------------------------------+
2929
| Overridden | - `choices`_ |
30-
| options | |
30+
| options | - `choice_translation_domain`_ |
3131
+-------------+------------------------------------------------------------------------+
3232
| Inherited | from the :doc:`ChoiceType </reference/forms/types/choice>` |
3333
| options | |
@@ -96,6 +96,8 @@ The default locale is used to translate the languages names.
9696
If you want to override the built-in choices of the language type, you
9797
will also have to set the ``choice_loader`` option to ``null``.
9898

99+
.. include:: /reference/forms/types/options/choice_translation_domain_disabled.rst.inc
100+
99101
Inherited Options
100102
-----------------
101103

‎reference/forms/types/locale.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ manually, but then you should just use the ``ChoiceType`` directly.
2727
| Options | - `choice_translation_locale`_ |
2828
+-------------+------------------------------------------------------------------------+
2929
| Overridden | - `choices`_ |
30-
| options | |
30+
| options | - `choice_translation_domain`_ |
3131
+-------------+------------------------------------------------------------------------+
3232
| Inherited | from the :doc:`ChoiceType </reference/forms/types/choice>` |
3333
| options | |
@@ -83,6 +83,8 @@ specify the language.
8383
If you want to override the built-in choices of the locale type, you
8484
will also have to set the ``choice_loader`` option to ``null``.
8585

86+
.. include:: /reference/forms/types/options/choice_translation_domain_disabled.rst.inc
87+
8688
Inherited Options
8789
-----------------
8890

‎reference/forms/types/options/choice_translation_domain.rst.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
``choice_translation_domain``
22
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
33

4-
**type**: ``string``, ``boolean`` or ``null``
4+
DEFAULT_VALUE
55

66
This option determines if the choice values should be translated and in which
77
translation domain.

‎reference/forms/types/options/choice_translation_domain_disabled.rst.inc

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
.. include:: /reference/forms/types/options/choice_translation_domain.rst.inc
2+
:end-before: DEFAULT_VALUE
3+
4+
**type**: ``string``, ``boolean`` or ``null`` **default**: ``false``
5+
6+
.. include:: /reference/forms/types/options/choice_translation_domain.rst.inc
7+
:start-after: DEFAULT_VALUE

‎reference/forms/types/options/choice_translation_domain_enabled.rst.inc

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
.. include:: /reference/forms/types/options/choice_translation_domain.rst.inc
2+
:end-before: DEFAULT_VALUE
3+
4+
**type**: ``string``, ``boolean`` or ``null`` **default**: ``true``
5+
6+
.. include:: /reference/forms/types/options/choice_translation_domain.rst.inc
7+
:start-after: DEFAULT_VALUE

‎reference/forms/types/time.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ values.
9090
Field Options
9191
-------------
9292

93-
.. include:: /reference/forms/types/options/choice_translation_domain.rst.inc
93+
.. include:: /reference/forms/types/options/choice_translation_domain_disabled.rst.inc
9494

9595
placeholder
9696
~~~~~~~~~~~

‎reference/forms/types/timezone.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ manually, but then you should just use the ``ChoiceType`` directly.
2222
| | - `regions`_ |
2323
+-------------+------------------------------------------------------------------------+
2424
| Overridden | - `choices`_ |
25-
| options | |
25+
| options | - `choice_translation_domain`_ |
2626
+-------------+------------------------------------------------------------------------+
2727
| Inherited | from the :doc:`ChoiceType </reference/forms/types/choice>` |
2828
| options | |
@@ -126,6 +126,8 @@ The Timezone type defaults the choices to all timezones returned by
126126
If you want to override the built-in choices of the timezone type, you
127127
will also have to set the ``choice_loader`` option to ``null``.
128128

129+
.. include:: /reference/forms/types/options/choice_translation_domain_disabled.rst.inc
130+
129131
Inherited Options
130132
-----------------
131133

0 commit comments

Comments
 (0)