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 #18149 -- Changed language codes for Chinese

Browse Source 
Language codes for Chinese are zh_Hans (Simplified) and zh_Hant (Traditional).
Added support for browsers that still send the deprecated language codes.

Thanks to Olli Wang for the report.
This commit is contained in:
Bouke Haarsma
2013-11-04 18:31:34 +01:00
parent cb2c3ce154
commit c0a2388a1c
17 changed files with 2593 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
docs/internals/deprecation.txt
View File

@@ -476,6 +476,9 @@ these changes.
* The class ``django.utils.datastructures.MergeDict`` will be removed.
* The ``zh_CN`` and ``zh_TW`` language codes will be removed and have been
replaced by the ``zh_Hans`` and ``zh_Hant`` language code respectively.
2.0
---

8
docs/releases/1.7.txt
View File

@@ -697,3 +697,11 @@ deprecated and will be removed in Django 1.9.
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``
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
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.