diff options
| author | Bouke Haarsma <bouke@webatoom.nl> | 2013-11-11 09:05:17 +0100 |
|---|---|---|
| committer | Bouke Haarsma <bouke@webatoom.nl> | 2013-11-11 13:34:01 +0100 |
| commit | 4142d151025d6169d67b513c4569603d0e751a6d (patch) | |
| tree | 10f53cb50fb1cd495068ba423e3cb3c00d3dd8c9 /docs | |
| parent | dffcc5e97988d92b2b8a3bba23a49bcb3cf5d040 (diff) | |
Fixed #21388 -- Corrected language code for Frisian
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/releases/1.7.txt | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/docs/releases/1.7.txt b/docs/releases/1.7.txt index d703f44e4b..983ba3a71d 100644 --- a/docs/releases/1.7.txt +++ b/docs/releases/1.7.txt @@ -743,15 +743,15 @@ 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``, ``zh-tw`` and ``fy-nl`` +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -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. +The currently used language codes for Simplified Chinese ``zh-cn``, +Traditional Chinese ``zh-tw`` and (Western) Frysian ``fy-nl`` are deprecated +and should be replaced by the language codes ``zh-hans``, ``zh-hant`` and +``fy`` 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. ``django.utils.functional.memoize`` function ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |