From c0a2388a1c4ead1afaec98e4ebc953a772ca3849 Mon Sep 17 00:00:00 2001 From: Bouke Haarsma Date: Mon, 4 Nov 2013 18:31:34 +0100 Subject: Fixed #18149 -- Changed language codes for Chinese 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. --- docs/internals/deprecation.txt | 3 +++ docs/releases/1.7.txt | 8 ++++++++ 2 files changed, 11 insertions(+) (limited to 'docs') diff --git a/docs/internals/deprecation.txt b/docs/internals/deprecation.txt index 42b81419ec..c63724f4bb 100644 --- a/docs/internals/deprecation.txt +++ b/docs/internals/deprecation.txt @@ -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 --- diff --git a/docs/releases/1.7.txt b/docs/releases/1.7.txt index 2e596b3dc8..802d16cc5c 100644 --- a/docs/releases/1.7.txt +++ b/docs/releases/1.7.txt @@ -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. -- cgit v1.3