fix default value of choice_translation_domain for choice types

xabbuh · xabbuh · commit c0a42dedea68 · 2020-09-12T14:56:31.000+02:00
diff --git a/reference/forms/types/birthday.rst b/reference/forms/types/birthday.rst
@@ -64,7 +64,7 @@ Inherited Options
 
 These options inherit from the :doc:`DateType </reference/forms/types/date>`:
 
-.. include:: /reference/forms/types/options/choice_translation_domain.rst.inc
+.. include:: /reference/forms/types/options/choice_translation_domain_disabled.rst.inc
 
 .. include:: /reference/forms/types/options/days.rst.inc
 
diff --git a/reference/forms/types/choice.rst b/reference/forms/types/choice.rst
@@ -236,7 +236,7 @@ the choice options would need to be resolved thus triggering the callback.
 
 .. include:: /reference/forms/types/options/choice_name.rst.inc
 
-.. include:: /reference/forms/types/options/choice_translation_domain.rst.inc
+.. include:: /reference/forms/types/options/choice_translation_domain_enabled.rst.inc
 
 .. include:: /reference/forms/types/options/choice_value.rst.inc
 
diff --git a/reference/forms/types/country.rst b/reference/forms/types/country.rst
@@ -22,7 +22,7 @@ the option manually, but then you should just use the ``ChoiceType`` directly.
 | Rendered as | can be various tags (see :ref:`forms-reference-choice-tags`)          |
 +-------------+-----------------------------------------------------------------------+
 | Overridden  | - `choices`_                                                          |
-| options     |                                                                       |
+| options     | - `choice_translation_domain`_                                        |
 +-------------+-----------------------------------------------------------------------+
 | Inherited   | from the :doc:`ChoiceType </reference/forms/types/choice>`            |
 | options     |                                                                       |
@@ -67,6 +67,8 @@ The locale is used to translate the countries names.
     will also have to set the ``choice_loader`` option to ``null``. Not doing
     so is deprecated since Symfony 3.3.
 
+.. include:: /reference/forms/types/options/choice_translation_domain_disabled.rst.inc
+
 Inherited Options
 -----------------
 
diff --git a/reference/forms/types/currency.rst b/reference/forms/types/currency.rst
@@ -15,7 +15,7 @@ manually, but then you should just use the ``ChoiceType`` directly.
 | Rendered as | can be various tags (see :ref:`forms-reference-choice-tags`)           |
 +-------------+------------------------------------------------------------------------+
 | Overridden  | - `choices`_                                                           |
-| options     |                                                                        |
+| options     | - `choice_translation_domain`_                                         |
 +-------------+------------------------------------------------------------------------+
 | Inherited   | from the :doc:`ChoiceType </reference/forms/types/choice>`             |
 | options     |                                                                        |
@@ -58,6 +58,8 @@ The choices option defaults to all currencies.
     will also have to set the ``choice_loader`` option to ``null``. Not doing
     so is deprecated since Symfony 3.3.
 
+.. include:: /reference/forms/types/options/choice_translation_domain_disabled.rst.inc
+
 Inherited Options
 -----------------
 
diff --git a/reference/forms/types/date.rst b/reference/forms/types/date.rst
@@ -15,8 +15,7 @@ and can understand a number of different input formats via the `input`_ option.
 +----------------------+-----------------------------------------------------------------------------+
 | Rendered as          | single text box or three select fields                                      |
 +----------------------+-----------------------------------------------------------------------------+
-| Options              | - `choice_translation_domain`_                                              |
-|                      | - `days`_                                                                   |
+| Options              | - `days`_                                                                   |
 |                      | - `placeholder`_                                                            |
 |                      | - `format`_                                                                 |
 |                      | - `html5`_                                                                  |
@@ -28,6 +27,7 @@ and can understand a number of different input formats via the `input`_ option.
 |                      | - `years`_                                                                  |
 +----------------------+-----------------------------------------------------------------------------+
 | Overridden options   | - `by_reference`_                                                           |
+|                      | - `choice_translation_domain`_                                              |
 |                      | - `compound`_                                                               |
 |                      | - `data_class`_                                                             |
 |                      | - `error_bubbling`_                                                         |
@@ -135,8 +135,6 @@ that Symfony should expect via the `format`_ option.
 Field Options
 -------------
 
-.. include:: /reference/forms/types/options/choice_translation_domain.rst.inc
-
 .. include:: /reference/forms/types/options/days.rst.inc
 
 ``placeholder``
@@ -191,6 +189,8 @@ Overridden Options
 
 The ``DateTime`` classes are treated as immutable objects.
 
+.. include:: /reference/forms/types/options/choice_translation_domain_disabled.rst.inc
+
 .. include:: /reference/forms/types/options/compound_type.rst.inc
 
 .. include:: /reference/forms/types/options/data_class_date.rst.inc
diff --git a/reference/forms/types/entity.rst b/reference/forms/types/entity.rst
@@ -258,7 +258,7 @@ These options inherit from the :doc:`ChoiceType </reference/forms/types/choice>`
 
 .. include:: /reference/forms/types/options/choice_attr.rst.inc
 
-.. include:: /reference/forms/types/options/choice_translation_domain.rst.inc
+.. include:: /reference/forms/types/options/choice_translation_domain_disabled.rst.inc
 
 .. include:: /reference/forms/types/options/expanded.rst.inc
 
diff --git a/reference/forms/types/language.rst b/reference/forms/types/language.rst
@@ -24,7 +24,7 @@ manually, but then you should just use the ``ChoiceType`` directly.
 | Rendered as | can be various tags (see :ref:`forms-reference-choice-tags`)           |
 +-------------+------------------------------------------------------------------------+
 | Overridden  | - `choices`_                                                           |
-| options     |                                                                        |
+| options     | - `choice_translation_domain`_                                         |
 +-------------+------------------------------------------------------------------------+
 | Inherited   | from the :doc:`ChoiceType </reference/forms/types/choice>`             |
 | options     |                                                                        |
@@ -69,6 +69,8 @@ The default locale is used to translate the languages names.
     will also have to set the ``choice_loader`` option to ``null``. Not doing
     so is deprecated since Symfony 3.3.
 
+.. include:: /reference/forms/types/options/choice_translation_domain_disabled.rst.inc
+
 Inherited Options
 -----------------
 
diff --git a/reference/forms/types/locale.rst b/reference/forms/types/locale.rst
@@ -25,7 +25,7 @@ manually, but then you should just use the ``ChoiceType`` directly.
 | Rendered as | can be various tags (see :ref:`forms-reference-choice-tags`)           |
 +-------------+------------------------------------------------------------------------+
 | Overridden  | - `choices`_                                                           |
-| options     |                                                                        |
+| options     | - `choice_translation_domain`_                                         |
 +-------------+------------------------------------------------------------------------+
 | Inherited   | from the :doc:`ChoiceType </reference/forms/types/choice>`             |
 | options     |                                                                        |
@@ -70,6 +70,8 @@ specify the language.
     will also have to set the ``choice_loader`` option to ``null``. Not doing
     so is deprecated since Symfony 3.3.
 
+.. include:: /reference/forms/types/options/choice_translation_domain_disabled.rst.inc
+
 Inherited Options
 -----------------
 
diff --git a/reference/forms/types/options/choice_translation_domain.rst.inc b/reference/forms/types/options/choice_translation_domain.rst.inc
@@ -1,7 +1,7 @@
 ``choice_translation_domain``
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-**type**: ``string``, ``boolean`` or ``null``
+DEFAULT_VALUE
 
 This option determines if the choice values should be translated and in which
 translation domain.
diff --git a/reference/forms/types/options/choice_translation_domain_disabled.rst.inc b/reference/forms/types/options/choice_translation_domain_disabled.rst.inc
@@ -0,0 +1,7 @@
+.. include:: /reference/forms/types/options/choice_translation_domain.rst.inc
+    :end-before: DEFAULT_VALUE
+
+**type**: ``string``, ``boolean`` or ``null`` **default**: ``false``
+
+.. include:: /reference/forms/types/options/choice_translation_domain.rst.inc
+    :start-after: DEFAULT_VALUE
diff --git a/reference/forms/types/options/choice_translation_domain_enabled.rst.inc b/reference/forms/types/options/choice_translation_domain_enabled.rst.inc
@@ -0,0 +1,7 @@
+.. include:: /reference/forms/types/options/choice_translation_domain.rst.inc
+    :end-before: DEFAULT_VALUE
+
+**type**: ``string``, ``boolean`` or ``null`` **default**: ``true``
+
+.. include:: /reference/forms/types/options/choice_translation_domain.rst.inc
+    :start-after: DEFAULT_VALUE
diff --git a/reference/forms/types/time.rst b/reference/forms/types/time.rst
@@ -81,7 +81,7 @@ values.
 Field Options
 -------------
 
-.. include:: /reference/forms/types/options/choice_translation_domain.rst.inc
+.. include:: /reference/forms/types/options/choice_translation_domain_disabled.rst.inc
 
 ``placeholder``
 ~~~~~~~~~~~~~~~
diff --git a/reference/forms/types/timezone.rst b/reference/forms/types/timezone.rst
@@ -21,7 +21,7 @@ manually, but then you should just use the ``ChoiceType`` directly.
 |             | - `regions`_                                                           |
 +-------------+------------------------------------------------------------------------+
 | Overridden  | - `choices`_                                                           |
-| options     |                                                                        |
+| options     | - `choice_translation_domain`_                                         |
 +-------------+------------------------------------------------------------------------+
 | Inherited   | from the :doc:`ChoiceType </reference/forms/types/choice>`             |
 | options     |                                                                        |
@@ -87,6 +87,8 @@ The Timezone type defaults the choices to all timezones returned by
     will also have to set the ``choice_loader`` option to ``null``. Not doing
     so is deprecated since Symfony 3.3.
 
+.. include:: /reference/forms/types/options/choice_translation_domain_disabled.rst.inc
+
 Inherited Options
 -----------------
 
