summaryrefslogtreecommitdiff
path: root/docs/releases/1.7.txt
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2013-11-11 09:33:55 -0800
committerClaude Paroz <claude@2xlibre.net>2013-11-11 09:33:55 -0800
commit0be7f57a9067c1596ece496e50a796b2529452bc (patch)
tree017a5a77e1199f3cae53dea008c7f177f91f0be6 /docs/releases/1.7.txt
parent5fda9c9810dfdf36b557e10d0d76775a72b0e0c6 (diff)
parent4142d151025d6169d67b513c4569603d0e751a6d (diff)
Merge pull request #1907 from Bouke/tickets/21388
Fixed #21388 -- Corrected language code for Frisian
Diffstat (limited to 'docs/releases/1.7.txt')
-rw-r--r--docs/releases/1.7.txt16
1 files changed, 8 insertions, 8 deletions
diff --git a/docs/releases/1.7.txt b/docs/releases/1.7.txt
index 7b527ce7fb..2a2fd30363 100644
--- a/docs/releases/1.7.txt
+++ b/docs/releases/1.7.txt
@@ -747,15 +747,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
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~