mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-24 06:06:09 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #29144 -- Made untranslated strings for territorial language variants use translations from the generic language variant.

Browse Source
This commit is contained in:
Patryk Zawadzki
2018-02-19 19:09:33 +01:00
committed by Tim Graham
parent 939e0a5995
commit a20aae414e
9 changed files with 81 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/releases/2.1.txt
View File

@@ -179,6 +179,10 @@ Internationalization
* Added the :meth:`~django.utils.translation.get_supported_language_variant`
function.
* Untranslated strings for territorial language variants now use the
translations of the generic language. For example, untranslated ``pt_BR``
strings use ``pt`` translations.
Management Commands
~~~~~~~~~~~~~~~~~~~

8
docs/topics/i18n/translation.txt
View File

@@ -2082,7 +2082,13 @@ translations for the same literal:
In all cases the name of the directory containing the translation is expected to
be named using :term:`locale name` notation. E.g. ``de``, ``pt_BR``, ``es_AR``,
etc.
etc. Untranslated strings for territorial language variants use the translations
of the generic language. For example, untranslated ``pt_BR`` strings use ``pt``
translations.
.. versionchanged:: 2.1
Fallback to the generic language as described above was added.
This way, you can write applications that include their own translations, and
you can override base translations in your project. Or, you can just build