minor #6548 merge choice_translation_domain files (xabbuh)

wouterj · wouterj · commit 1b8163eac893 · 2016-05-13T19:21:17.000+02:00
This PR was merged into the 3.0 branch. Discussion ---------- merge choice_translation_domain files Commits ------- ac8a4d4 merge choice_translation_domain files
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/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
@@ -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
@@ -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
diff --git 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
diff --git 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
 ~~~~~~~~~~~
