From ac8a4d489d7b2dffeb0ba52b2c00ce7c819905ad Mon Sep 17 00:00:00 2001 From: Christian Flothmann Date: Mon, 9 May 2016 09:12:58 +0200 Subject: [PATCH] merge choice_translation_domain files --- reference/forms/types/birthday.rst | 2 +- reference/forms/types/date.rst | 2 +- reference/forms/types/datetime.rst | 2 +- .../options/_choice_translation_domain_body.rst.inc | 9 --------- .../types/options/choice_translation_domain.rst.inc | 10 +++++++++- .../options/datetime_choice_translation_domain.rst.inc | 4 ---- reference/forms/types/time.rst | 2 +- 7 files changed, 13 insertions(+), 18 deletions(-) delete mode 100644 reference/forms/types/options/_choice_translation_domain_body.rst.inc delete mode 100644 reference/forms/types/options/datetime_choice_translation_domain.rst.inc diff --git a/reference/forms/types/birthday.rst b/reference/forms/types/birthday.rst index fa6aeebff67..2d961434b41 100644 --- 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 `: -.. include:: /reference/forms/types/options/datetime_choice_translation_domain.rst.inc +.. include:: /reference/forms/types/options/choice_translation_domain.rst.inc .. include:: /reference/forms/types/options/days.rst.inc diff --git a/reference/forms/types/date.rst b/reference/forms/types/date.rst index 025ff9d5abc..68d4877d8ce 100644 --- a/reference/forms/types/date.rst +++ b/reference/forms/types/date.rst @@ -85,7 +85,7 @@ values. Field Options ------------- -.. include:: /reference/forms/types/options/datetime_choice_translation_domain.rst.inc +.. include:: /reference/forms/types/options/choice_translation_domain.rst.inc .. include:: /reference/forms/types/options/days.rst.inc diff --git a/reference/forms/types/datetime.rst b/reference/forms/types/datetime.rst index 36e3f7df6b3..4a4d40e4768 100644 --- a/reference/forms/types/datetime.rst +++ b/reference/forms/types/datetime.rst @@ -55,7 +55,7 @@ the data can be a ``DateTime`` object, a string, a timestamp or an array. Field Options ------------- -.. include:: /reference/forms/types/options/datetime_choice_translation_domain.rst.inc +.. include:: /reference/forms/types/options/choice_translation_domain.rst.inc date_format ~~~~~~~~~~~ diff --git a/reference/forms/types/options/_choice_translation_domain_body.rst.inc b/reference/forms/types/options/_choice_translation_domain_body.rst.inc deleted file mode 100644 index 42cfc56a529..00000000000 --- a/reference/forms/types/options/_choice_translation_domain_body.rst.inc +++ /dev/null @@ -1,9 +0,0 @@ -**type**: ``string``, ``boolean`` or ``null`` - -This option determines if the choice values should be translated and in which -translation domain. - -The values of the ``choice_translation_domain`` option can be ``true`` (reuse the current -translation domain), ``false`` (disable translation), ``null`` (uses the parent translation -domain or the default domain) or a string which represents the exact translation -domain to use. diff --git a/reference/forms/types/options/choice_translation_domain.rst.inc b/reference/forms/types/options/choice_translation_domain.rst.inc index 977b62ec629..ebd6329eb04 100644 --- a/reference/forms/types/options/choice_translation_domain.rst.inc +++ b/reference/forms/types/options/choice_translation_domain.rst.inc @@ -1,4 +1,12 @@ choice_translation_domain ~~~~~~~~~~~~~~~~~~~~~~~~~ -.. include:: /reference/forms/types/options/_choice_translation_domain_body.rst.inc +**type**: ``string``, ``boolean`` or ``null`` + +This option determines if the choice values should be translated and in which +translation domain. + +The values of the ``choice_translation_domain`` option can be ``true`` (reuse the current +translation domain), ``false`` (disable translation), ``null`` (uses the parent translation +domain or the default domain) or a string which represents the exact translation +domain to use. diff --git a/reference/forms/types/options/datetime_choice_translation_domain.rst.inc b/reference/forms/types/options/datetime_choice_translation_domain.rst.inc deleted file mode 100644 index 977b62ec629..00000000000 --- a/reference/forms/types/options/datetime_choice_translation_domain.rst.inc +++ /dev/null @@ -1,4 +0,0 @@ -choice_translation_domain -~~~~~~~~~~~~~~~~~~~~~~~~~ - -.. include:: /reference/forms/types/options/_choice_translation_domain_body.rst.inc diff --git a/reference/forms/types/time.rst b/reference/forms/types/time.rst index e8114099b06..19c960f7e9e 100644 --- a/reference/forms/types/time.rst +++ b/reference/forms/types/time.rst @@ -82,7 +82,7 @@ values. Field Options ------------- -.. include:: /reference/forms/types/options/datetime_choice_translation_domain.rst.inc +.. include:: /reference/forms/types/options/choice_translation_domain.rst.inc placeholder ~~~~~~~~~~~