Skip to content

Commit 0625d9c

Browse files
committed
Minor reword
1 parent 8b33bc5 commit 0625d9c

File tree

3 files changed

+18
-10
lines changed

3 files changed

+18
-10
lines changed

reference/forms/types/country.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ the option manually, but then you should just use the ``ChoiceType`` directly.
2121
+-------------+-----------------------------------------------------------------------+
2222
| Rendered as | can be various tags (see :ref:`forms-reference-choice-tags`) |
2323
+-------------+-----------------------------------------------------------------------+
24-
| Options | - `choice_translation_locale`_ |
25-
| | - `alpha3`_ |
24+
| Options | - `alpha3`_ |
25+
| | - `choice_translation_locale`_ |
2626
+-------------+-----------------------------------------------------------------------+
2727
| Overridden | - `choices`_ |
2828
| options | |
@@ -63,10 +63,10 @@ the option manually, but then you should just use the ``ChoiceType`` directly.
6363
Field Options
6464
-------------
6565

66-
.. include:: /reference/forms/types/options/choice_translation_locale.rst.inc
67-
6866
.. include:: /reference/forms/types/options/alpha3.rst.inc
6967

68+
.. include:: /reference/forms/types/options/choice_translation_locale.rst.inc
69+
7070
Overridden Options
7171
------------------
7272

reference/forms/types/language.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ manually, but then you should just use the ``ChoiceType`` directly.
2323
+-------------+------------------------------------------------------------------------+
2424
| Rendered as | can be various tags (see :ref:`forms-reference-choice-tags`) |
2525
+-------------+------------------------------------------------------------------------+
26-
| Options | - `choice_translation_locale`_ |
27-
| | - `alpha3`_ |
26+
| Options | - `alpha3`_ |
27+
| | - `choice_translation_locale`_ |
2828
+-------------+------------------------------------------------------------------------+
2929
| Overridden | - `choices`_ |
3030
| options | |
@@ -65,10 +65,10 @@ manually, but then you should just use the ``ChoiceType`` directly.
6565
Field Options
6666
-------------
6767

68-
.. include:: /reference/forms/types/options/choice_translation_locale.rst.inc
69-
7068
.. include:: /reference/forms/types/options/alpha3.rst.inc
7169

70+
.. include:: /reference/forms/types/options/choice_translation_locale.rst.inc
71+
7272
Overridden Options
7373
------------------
7474

reference/forms/types/options/alpha3.rst.inc

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,13 @@ alpha3
33

44
**type**: ``boolean`` **default**: ``false``
55

6-
This option determines if the choice values should be in the alpha3 instead
7-
of the alpha2 format.
6+
.. versionadded:: 4.4
7+
8+
The ``alpha3`` option was introduced in Symfony 4.4.
9+
10+
If this option is ``true``, the choice values use the `ISO 3166-1 alpha-3`_
11+
three-letter codes (e.g. New Zealand = ``NZL``) instead of the default
12+
`ISO 3166-1 alpha-2`_ two-letter codes (e.g. New Zealand = ``NZ``).
13+
14+
.. _`ISO 3166-1 alpha-2`: https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2
15+
.. _`ISO 3166-1 alpha-3`: https://en.wikipedia.org/wiki/ISO_3166-1_alpha-3

0 commit comments

Comments
 (0)