Skip to content

merge choice_translation_domain files #6548

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 13, 2016
Merged

merge choice_translation_domain files #6548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion reference/forms/types/birthday.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion reference/forms/types/date.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion reference/forms/types/datetime.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
~~~~~~~~~~~
Expand Down
9 changes: 0 additions & 9 deletions reference/forms/types/options/_choice_translation_domain_body.rst.inc
View file
Open in desktop

This file was deleted.

10 changes: 9 additions & 1 deletion reference/forms/types/options/choice_translation_domain.rst.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
4 changes: 0 additions & 4 deletions reference/forms/types/options/datetime_choice_translation_domain.rst.inc
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion reference/forms/types/time.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
~~~~~~~~~~~
Expand Down