Merge pull request #1907 from Bouke/tickets/21388

Fixed #21388 -- Corrected language code for Frisian

django/conf/global_settings.py

@@ -75,7 +75,7 @@ LANGUAGES = (
     ('fa', gettext_noop('Persian')),
     ('fi', gettext_noop('Finnish')),
     ('fr', gettext_noop('French')),
-    ('fy-nl', gettext_noop('Frisian')),
+    ('fy', gettext_noop('Frisian')),
     ('ga', gettext_noop('Irish')),
     ('gl', gettext_noop('Galician')),
     ('he', gettext_noop('Hebrew')),

django/conf/locale/__init__.py

@@ -167,11 +167,11 @@ LANG_INFO = {
         'name': 'French',
         'name_local': 'français',
     },
-    'fy-nl': {
+    'fy': {
         'bidi': False,
-        'code': 'fy-nl',
+        'code': 'fy',
         'name': 'Frisian',
-        'name_local': 'Frisian',
+        'name_local': 'frysk',
     },
     'ga': {
         'bidi': False,

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
+The currently used language codes for Simplified Chinese ``zh-cn``,
-Traditional Chinese ``zh-tw`` are deprecated and should be replaced by the
+Traditional Chinese ``zh-tw`` and (Western) Frysian ``fy-nl`` are deprecated
-recently introduced language codes ``zh-hans`` and ``zh-hant`` respectively.
+and should be replaced by the language codes ``zh-hans``, ``zh-hant`` and
-If you use these language codes, you should rename the locale directories
+``fy`` respectively. If you use these language codes, you should rename the
-and update your settings to reflect these changes. The deprecated language
+locale directories and update your settings to reflect these changes. The
-codes will be removed in Django 1.9.
+deprecated language codes will be removed in Django 1.9.
 
 ``django.utils.functional.memoize`` function
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~