Skip to content

Commit

Permalink
bug #4284 change misleading language identifier (Kristof Van Cauwenbe…
Browse files Browse the repository at this point in the history
…rgh, kristofvc)

This PR was merged into the 2.3 branch.

Discussion
----------

change misleading language identifier

| Q             | A
| ------------- | ---
| Doc fix?      | yes
| New docs?     | no
| Applies to    | 2.3
| Fixed tickets | #4251

Commits
-------

db85c67 formatting to follow 72 characters line limit
12cccc8 changed dash to underscore
d68cd09 change misleading language identifier
  • Loading branch information
weaverryan committed Oct 3, 2014
2 parents 7ab6df9 + db85c67 commit 9591a04
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions reference/forms/types/language.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ The ``language`` type is a subset of the ``ChoiceType`` that allows the user
to select from a large list of languages. As an added bonus, the language names
are displayed in the language of the user.

The "value" for each language is the *Unicode language identifier*
(e.g. ``fr`` or ``zh-Hant``).
The "value" for each language is the *Unicode language identifier* used in
the `International Components for Unicode`_ (e.g. ``fr`` or ``zh_Hant``).

.. note::

Expand Down Expand Up @@ -106,3 +106,5 @@ The actual default value of this option depends on other field options:
.. include:: /reference/forms/types/options/read_only.rst.inc

.. include:: /reference/forms/types/options/required.rst.inc

.. _`International Components for Unicode`: http://site.icu-project.org

0 comments on commit 9591a04

Please sign in to comment.