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

Fixed #18419 -- Full backwards compatibility for old language codes

Browse Source 
Improved documentation about zh-* deprecation and upgrade path.

Thanks to Baptiste Mispelon for the code reviews.
This commit is contained in:
Bouke Haarsma
2013-11-05 10:54:23 +01:00
committed by Baptiste Mispelon
parent 76da053641
commit e5e044da87
4 changed files with 51 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
docs/releases/1.7.txt
View File

@@ -707,10 +707,12 @@ arguments into a ``REQUEST`` property on ``WSGIRequest``. To merge
dictionaries, use ``dict.update()`` instead. The class ``MergeDict`` is
deprecated and will be removed in Django 1.9.
Language codes ``zh_CN`` and ``zh_TW``
Language codes ``zh-cn`` and ``zh-tw``
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The currently used language codes for Simplified Chinese ``zh_CN`` and
Traditional Chinese ``zh_TW`` are deprecated and should be replaced by the
recently introduced language codes ``zh_Hans`` and ``zh_Hant`` respectively.
The deprecated language codes will be removed in Django 1.9.
The currently used language codes for Simplified Chinese ``zh-cn`` and
Traditional Chinese ``zh-tw`` are deprecated and should be replaced by the
recently introduced language codes ``zh-hans`` and ``zh-hant`` respectively.
If you use these language codes, you should rename the locale directories
and update your settings to reflect these changes. The deprecated language
codes will be removed in Django 1.9.