diff options
| author | Bouke Haarsma <bouke@webatoom.nl> | 2013-11-05 10:54:23 +0100 |
|---|---|---|
| committer | Baptiste Mispelon <bmispelon@gmail.com> | 2013-11-05 19:26:58 +0100 |
| commit | e5e044da87800feb6ef63fef1765d8c05022d926 (patch) | |
| tree | 90b25f2aa84598ccbf82eb49dcbcf9f919630568 /docs | |
| parent | 76da053641e52db540801e18b362497c01e9bb1d (diff) | |
Fixed #18419 -- Full backwards compatibility for old language codes
Improved documentation about zh-* deprecation and upgrade path.
Thanks to Baptiste Mispelon for the code reviews.
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/internals/deprecation.txt | 4 | ||||
| -rw-r--r-- | docs/releases/1.7.txt | 12 |
2 files changed, 9 insertions, 7 deletions
diff --git a/docs/internals/deprecation.txt b/docs/internals/deprecation.txt index c63724f4bb..eb7df979de 100644 --- a/docs/internals/deprecation.txt +++ b/docs/internals/deprecation.txt @@ -476,8 +476,8 @@ 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. +* 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 1bf93468ef..85e01cbe59 100644 --- a/docs/releases/1.7.txt +++ b/docs/releases/1.7.txt @@ -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. |