diff options
| author | Aymeric Augustin <aymeric.augustin@m4x.org> | 2013-11-04 14:17:34 -0800 |
|---|---|---|
| committer | Aymeric Augustin <aymeric.augustin@m4x.org> | 2013-11-04 14:17:34 -0800 |
| commit | 859a20560ebd44d917e564d16f3f5f7091c7d823 (patch) | |
| tree | 8cc17cbee0032c9597e69cd53837d9573099541e /docs | |
| parent | cb2c3ce15443a0666646e8b60984830c38d3ecde (diff) | |
| parent | c0a2388a1c4ead1afaec98e4ebc953a772ca3849 (diff) | |
Merge pull request #1868 from Bouke/tickets/18419
Fixed #18149 -- Changed language codes for Chinese
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/internals/deprecation.txt | 3 | ||||
| -rw-r--r-- | docs/releases/1.7.txt | 8 |
2 files changed, 11 insertions, 0 deletions
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. |