Skip to content

Commit 8b487eb

Browse files
committed
Merge branch '4.4' into 5.3
* 4.4: Language codes: 'ISO 639-2 alpha-3' mentions specified to 'ISO 639-2 alpha-3 (2T)'.
2 parents 244d498 + d987792 commit 8b487eb

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

components/intl.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ Language and Script Names
4444
~~~~~~~~~~~~~~~~~~~~~~~~~
4545

4646
The ``Languages`` class provides access to the name of all languages
47-
according to the `ISO 639-1 alpha-2`_ list and the `ISO 639-2 alpha-3`_ list::
47+
according to the `ISO 639-1 alpha-2`_ list and the `ISO 639-2 alpha-3 (2T)`_ list::
4848

4949
use Symfony\Component\Intl\Languages;
5050

@@ -388,4 +388,4 @@ Learn more
388388
.. _`UTC/GMT time offsets`: https://en.wikipedia.org/wiki/List_of_UTC_time_offsets
389389
.. _`daylight saving time (DST)`: https://en.wikipedia.org/wiki/Daylight_saving_time
390390
.. _`ISO 639-1 alpha-2`: https://en.wikipedia.org/wiki/ISO_639-1
391-
.. _`ISO 639-2 alpha-3`: https://en.wikipedia.org/wiki/ISO_639-2
391+
.. _`ISO 639-2 alpha-3 (2T)`: https://en.wikipedia.org/wiki/ISO_639-2

reference/forms/types/language.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ alpha3
7676

7777
**type**: ``boolean`` **default**: ``false``
7878

79-
If this option is ``true``, the choice values use the `ISO 639-2 alpha-3`_
79+
If this option is ``true``, the choice values use the `ISO 639-2 alpha-3 (2T)`_
8080
three-letter codes (e.g. French = ``fra``) instead of the default
8181
`ISO 639-1 alpha-2`_ two-letter codes (e.g. French = ``fr``).
8282

@@ -179,5 +179,5 @@ The actual default value of this option depends on other field options:
179179
.. include:: /reference/forms/types/options/row_attr.rst.inc
180180

181181
.. _`ISO 639-1 alpha-2`: https://en.wikipedia.org/wiki/ISO_639-1
182-
.. _`ISO 639-2 alpha-3`: https://en.wikipedia.org/wiki/ISO_639-2
182+
.. _`ISO 639-2 alpha-3 (2T)`: https://en.wikipedia.org/wiki/ISO_639-2
183183
.. _`International Components for Unicode`: http://site.icu-project.org

0 commit comments

Comments
 (0)