From 4142d151025d6169d67b513c4569603d0e751a6d Mon Sep 17 00:00:00 2001
From: Bouke Haarsma <bouke@webatoom.nl>
Date: Mon, 11 Nov 2013 09:05:17 +0100
Subject: [PATCH] Fixed #21388 -- Corrected language code for Frisian

---
 django/conf/global_settings.py                  |   2 +-
 django/conf/locale/__init__.py                  |   6 +++---
 .../locale/{fy_NL => fy}/LC_MESSAGES/django.mo  | Bin
 .../locale/{fy_NL => fy}/LC_MESSAGES/django.po  |   0
 django/conf/locale/{fy_NL => fy}/__init__.py    |   0
 django/conf/locale/{fy_NL => fy}/formats.py     |   0
 .../locale/{fy_NL => fy}/LC_MESSAGES/django.mo  | Bin
 .../locale/{fy_NL => fy}/LC_MESSAGES/django.po  |   0
 .../{fy_NL => fy}/LC_MESSAGES/djangojs.mo       | Bin
 .../{fy_NL => fy}/LC_MESSAGES/djangojs.po       |   0
 .../locale/{fy_NL => fy}/LC_MESSAGES/django.mo  | Bin
 .../locale/{fy_NL => fy}/LC_MESSAGES/django.po  |   0
 .../locale/{fy_NL => fy}/LC_MESSAGES/django.mo  | Bin
 .../locale/{fy_NL => fy}/LC_MESSAGES/django.po  |   0
 .../locale/{fy_NL => fy}/LC_MESSAGES/django.mo  | Bin
 .../locale/{fy_NL => fy}/LC_MESSAGES/django.po  |   0
 .../locale/{fy_NL => fy}/LC_MESSAGES/django.mo  | Bin
 .../locale/{fy_NL => fy}/LC_MESSAGES/django.po  |   0
 .../locale/{fy_NL => fy}/LC_MESSAGES/django.mo  | Bin
 .../locale/{fy_NL => fy}/LC_MESSAGES/django.po  |   0
 .../locale/{fy_NL => fy}/LC_MESSAGES/django.mo  | Bin
 .../locale/{fy_NL => fy}/LC_MESSAGES/django.po  |   0
 .../locale/{fy_NL => fy}/LC_MESSAGES/django.mo  | Bin
 .../locale/{fy_NL => fy}/LC_MESSAGES/django.po  |   0
 .../locale/{fy_NL => fy}/LC_MESSAGES/django.mo  | Bin
 .../locale/{fy_NL => fy}/LC_MESSAGES/django.po  |   0
 .../locale/{fy_NL => fy}/LC_MESSAGES/django.mo  | Bin
 .../locale/{fy_NL => fy}/LC_MESSAGES/django.po  |   0
 .../locale/{fy_NL => fy}/LC_MESSAGES/django.mo  | Bin
 .../locale/{fy_NL => fy}/LC_MESSAGES/django.po  |   0
 .../locale/{fy_NL => fy}/LC_MESSAGES/django.mo  | Bin
 .../locale/{fy_NL => fy}/LC_MESSAGES/django.po  |   0
 .../locale/{fy_NL => fy}/LC_MESSAGES/django.mo  | Bin
 .../locale/{fy_NL => fy}/LC_MESSAGES/django.po  |   0
 docs/releases/1.7.txt                           |  16 ++++++++--------
 35 files changed, 12 insertions(+), 12 deletions(-)
 rename django/conf/locale/{fy_NL => fy}/LC_MESSAGES/django.mo (100%)
 rename django/conf/locale/{fy_NL => fy}/LC_MESSAGES/django.po (100%)
 rename django/conf/locale/{fy_NL => fy}/__init__.py (100%)
 rename django/conf/locale/{fy_NL => fy}/formats.py (100%)
 rename django/contrib/admin/locale/{fy_NL => fy}/LC_MESSAGES/django.mo (100%)
 rename django/contrib/admin/locale/{fy_NL => fy}/LC_MESSAGES/django.po (100%)
 rename django/contrib/admin/locale/{fy_NL => fy}/LC_MESSAGES/djangojs.mo (100%)
 rename django/contrib/admin/locale/{fy_NL => fy}/LC_MESSAGES/djangojs.po (100%)
 rename django/contrib/admindocs/locale/{fy_NL => fy}/LC_MESSAGES/django.mo (100%)
 rename django/contrib/admindocs/locale/{fy_NL => fy}/LC_MESSAGES/django.po (100%)
 rename django/contrib/auth/locale/{fy_NL => fy}/LC_MESSAGES/django.mo (100%)
 rename django/contrib/auth/locale/{fy_NL => fy}/LC_MESSAGES/django.po (100%)
 rename django/contrib/comments/locale/{fy_NL => fy}/LC_MESSAGES/django.mo (100%)
 rename django/contrib/comments/locale/{fy_NL => fy}/LC_MESSAGES/django.po (100%)
 rename django/contrib/contenttypes/locale/{fy_NL => fy}/LC_MESSAGES/django.mo (100%)
 rename django/contrib/contenttypes/locale/{fy_NL => fy}/LC_MESSAGES/django.po (100%)
 rename django/contrib/flatpages/locale/{fy_NL => fy}/LC_MESSAGES/django.mo (100%)
 rename django/contrib/flatpages/locale/{fy_NL => fy}/LC_MESSAGES/django.po (100%)
 rename django/contrib/formtools/locale/{fy_NL => fy}/LC_MESSAGES/django.mo (100%)
 rename django/contrib/formtools/locale/{fy_NL => fy}/LC_MESSAGES/django.po (100%)
 rename django/contrib/gis/locale/{fy_NL => fy}/LC_MESSAGES/django.mo (100%)
 rename django/contrib/gis/locale/{fy_NL => fy}/LC_MESSAGES/django.po (100%)
 rename django/contrib/humanize/locale/{fy_NL => fy}/LC_MESSAGES/django.mo (100%)
 rename django/contrib/humanize/locale/{fy_NL => fy}/LC_MESSAGES/django.po (100%)
 rename django/contrib/messages/locale/{fy_NL => fy}/LC_MESSAGES/django.mo (100%)
 rename django/contrib/messages/locale/{fy_NL => fy}/LC_MESSAGES/django.po (100%)
 rename django/contrib/redirects/locale/{fy_NL => fy}/LC_MESSAGES/django.mo (100%)
 rename django/contrib/redirects/locale/{fy_NL => fy}/LC_MESSAGES/django.po (100%)
 rename django/contrib/sessions/locale/{fy_NL => fy}/LC_MESSAGES/django.mo (100%)
 rename django/contrib/sessions/locale/{fy_NL => fy}/LC_MESSAGES/django.po (100%)
 rename django/contrib/sites/locale/{fy_NL => fy}/LC_MESSAGES/django.mo (100%)
 rename django/contrib/sites/locale/{fy_NL => fy}/LC_MESSAGES/django.po (100%)

diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py
index 68459cc76d..d29dd5ec34 100644
--- a/django/conf/global_settings.py
+++ b/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')),
diff --git a/django/conf/locale/__init__.py b/django/conf/locale/__init__.py
index 32201488c8..a7a9baef53 100644
--- a/django/conf/locale/__init__.py
+++ b/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,
diff --git a/django/conf/locale/fy_NL/LC_MESSAGES/django.mo b/django/conf/locale/fy/LC_MESSAGES/django.mo
similarity index 100%
rename from django/conf/locale/fy_NL/LC_MESSAGES/django.mo
rename to django/conf/locale/fy/LC_MESSAGES/django.mo
diff --git a/django/conf/locale/fy_NL/LC_MESSAGES/django.po b/django/conf/locale/fy/LC_MESSAGES/django.po
similarity index 100%
rename from django/conf/locale/fy_NL/LC_MESSAGES/django.po
rename to django/conf/locale/fy/LC_MESSAGES/django.po
diff --git a/django/conf/locale/fy_NL/__init__.py b/django/conf/locale/fy/__init__.py
similarity index 100%
rename from django/conf/locale/fy_NL/__init__.py
rename to django/conf/locale/fy/__init__.py
diff --git a/django/conf/locale/fy_NL/formats.py b/django/conf/locale/fy/formats.py
similarity index 100%
rename from django/conf/locale/fy_NL/formats.py
rename to django/conf/locale/fy/formats.py
diff --git a/django/contrib/admin/locale/fy_NL/LC_MESSAGES/django.mo b/django/contrib/admin/locale/fy/LC_MESSAGES/django.mo
similarity index 100%
rename from django/contrib/admin/locale/fy_NL/LC_MESSAGES/django.mo
rename to django/contrib/admin/locale/fy/LC_MESSAGES/django.mo
diff --git a/django/contrib/admin/locale/fy_NL/LC_MESSAGES/django.po b/django/contrib/admin/locale/fy/LC_MESSAGES/django.po
similarity index 100%
rename from django/contrib/admin/locale/fy_NL/LC_MESSAGES/django.po
rename to django/contrib/admin/locale/fy/LC_MESSAGES/django.po
diff --git a/django/contrib/admin/locale/fy_NL/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/fy/LC_MESSAGES/djangojs.mo
similarity index 100%
rename from django/contrib/admin/locale/fy_NL/LC_MESSAGES/djangojs.mo
rename to django/contrib/admin/locale/fy/LC_MESSAGES/djangojs.mo
diff --git a/django/contrib/admin/locale/fy_NL/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/fy/LC_MESSAGES/djangojs.po
similarity index 100%
rename from django/contrib/admin/locale/fy_NL/LC_MESSAGES/djangojs.po
rename to django/contrib/admin/locale/fy/LC_MESSAGES/djangojs.po
diff --git a/django/contrib/admindocs/locale/fy_NL/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/fy/LC_MESSAGES/django.mo
similarity index 100%
rename from django/contrib/admindocs/locale/fy_NL/LC_MESSAGES/django.mo
rename to django/contrib/admindocs/locale/fy/LC_MESSAGES/django.mo
diff --git a/django/contrib/admindocs/locale/fy_NL/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/fy/LC_MESSAGES/django.po
similarity index 100%
rename from django/contrib/admindocs/locale/fy_NL/LC_MESSAGES/django.po
rename to django/contrib/admindocs/locale/fy/LC_MESSAGES/django.po
diff --git a/django/contrib/auth/locale/fy_NL/LC_MESSAGES/django.mo b/django/contrib/auth/locale/fy/LC_MESSAGES/django.mo
similarity index 100%
rename from django/contrib/auth/locale/fy_NL/LC_MESSAGES/django.mo
rename to django/contrib/auth/locale/fy/LC_MESSAGES/django.mo
diff --git a/django/contrib/auth/locale/fy_NL/LC_MESSAGES/django.po b/django/contrib/auth/locale/fy/LC_MESSAGES/django.po
similarity index 100%
rename from django/contrib/auth/locale/fy_NL/LC_MESSAGES/django.po
rename to django/contrib/auth/locale/fy/LC_MESSAGES/django.po
diff --git a/django/contrib/comments/locale/fy_NL/LC_MESSAGES/django.mo b/django/contrib/comments/locale/fy/LC_MESSAGES/django.mo
similarity index 100%
rename from django/contrib/comments/locale/fy_NL/LC_MESSAGES/django.mo
rename to django/contrib/comments/locale/fy/LC_MESSAGES/django.mo
diff --git a/django/contrib/comments/locale/fy_NL/LC_MESSAGES/django.po b/django/contrib/comments/locale/fy/LC_MESSAGES/django.po
similarity index 100%
rename from django/contrib/comments/locale/fy_NL/LC_MESSAGES/django.po
rename to django/contrib/comments/locale/fy/LC_MESSAGES/django.po
diff --git a/django/contrib/contenttypes/locale/fy_NL/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/fy/LC_MESSAGES/django.mo
similarity index 100%
rename from django/contrib/contenttypes/locale/fy_NL/LC_MESSAGES/django.mo
rename to django/contrib/contenttypes/locale/fy/LC_MESSAGES/django.mo
diff --git a/django/contrib/contenttypes/locale/fy_NL/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/fy/LC_MESSAGES/django.po
similarity index 100%
rename from django/contrib/contenttypes/locale/fy_NL/LC_MESSAGES/django.po
rename to django/contrib/contenttypes/locale/fy/LC_MESSAGES/django.po
diff --git a/django/contrib/flatpages/locale/fy_NL/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/fy/LC_MESSAGES/django.mo
similarity index 100%
rename from django/contrib/flatpages/locale/fy_NL/LC_MESSAGES/django.mo
rename to django/contrib/flatpages/locale/fy/LC_MESSAGES/django.mo
diff --git a/django/contrib/flatpages/locale/fy_NL/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/fy/LC_MESSAGES/django.po
similarity index 100%
rename from django/contrib/flatpages/locale/fy_NL/LC_MESSAGES/django.po
rename to django/contrib/flatpages/locale/fy/LC_MESSAGES/django.po
diff --git a/django/contrib/formtools/locale/fy_NL/LC_MESSAGES/django.mo b/django/contrib/formtools/locale/fy/LC_MESSAGES/django.mo
similarity index 100%
rename from django/contrib/formtools/locale/fy_NL/LC_MESSAGES/django.mo
rename to django/contrib/formtools/locale/fy/LC_MESSAGES/django.mo
diff --git a/django/contrib/formtools/locale/fy_NL/LC_MESSAGES/django.po b/django/contrib/formtools/locale/fy/LC_MESSAGES/django.po
similarity index 100%
rename from django/contrib/formtools/locale/fy_NL/LC_MESSAGES/django.po
rename to django/contrib/formtools/locale/fy/LC_MESSAGES/django.po
diff --git a/django/contrib/gis/locale/fy_NL/LC_MESSAGES/django.mo b/django/contrib/gis/locale/fy/LC_MESSAGES/django.mo
similarity index 100%
rename from django/contrib/gis/locale/fy_NL/LC_MESSAGES/django.mo
rename to django/contrib/gis/locale/fy/LC_MESSAGES/django.mo
diff --git a/django/contrib/gis/locale/fy_NL/LC_MESSAGES/django.po b/django/contrib/gis/locale/fy/LC_MESSAGES/django.po
similarity index 100%
rename from django/contrib/gis/locale/fy_NL/LC_MESSAGES/django.po
rename to django/contrib/gis/locale/fy/LC_MESSAGES/django.po
diff --git a/django/contrib/humanize/locale/fy_NL/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/fy/LC_MESSAGES/django.mo
similarity index 100%
rename from django/contrib/humanize/locale/fy_NL/LC_MESSAGES/django.mo
rename to django/contrib/humanize/locale/fy/LC_MESSAGES/django.mo
diff --git a/django/contrib/humanize/locale/fy_NL/LC_MESSAGES/django.po b/django/contrib/humanize/locale/fy/LC_MESSAGES/django.po
similarity index 100%
rename from django/contrib/humanize/locale/fy_NL/LC_MESSAGES/django.po
rename to django/contrib/humanize/locale/fy/LC_MESSAGES/django.po
diff --git a/django/contrib/messages/locale/fy_NL/LC_MESSAGES/django.mo b/django/contrib/messages/locale/fy/LC_MESSAGES/django.mo
similarity index 100%
rename from django/contrib/messages/locale/fy_NL/LC_MESSAGES/django.mo
rename to django/contrib/messages/locale/fy/LC_MESSAGES/django.mo
diff --git a/django/contrib/messages/locale/fy_NL/LC_MESSAGES/django.po b/django/contrib/messages/locale/fy/LC_MESSAGES/django.po
similarity index 100%
rename from django/contrib/messages/locale/fy_NL/LC_MESSAGES/django.po
rename to django/contrib/messages/locale/fy/LC_MESSAGES/django.po
diff --git a/django/contrib/redirects/locale/fy_NL/LC_MESSAGES/django.mo b/django/contrib/redirects/locale/fy/LC_MESSAGES/django.mo
similarity index 100%
rename from django/contrib/redirects/locale/fy_NL/LC_MESSAGES/django.mo
rename to django/contrib/redirects/locale/fy/LC_MESSAGES/django.mo
diff --git a/django/contrib/redirects/locale/fy_NL/LC_MESSAGES/django.po b/django/contrib/redirects/locale/fy/LC_MESSAGES/django.po
similarity index 100%
rename from django/contrib/redirects/locale/fy_NL/LC_MESSAGES/django.po
rename to django/contrib/redirects/locale/fy/LC_MESSAGES/django.po
diff --git a/django/contrib/sessions/locale/fy_NL/LC_MESSAGES/django.mo b/django/contrib/sessions/locale/fy/LC_MESSAGES/django.mo
similarity index 100%
rename from django/contrib/sessions/locale/fy_NL/LC_MESSAGES/django.mo
rename to django/contrib/sessions/locale/fy/LC_MESSAGES/django.mo
diff --git a/django/contrib/sessions/locale/fy_NL/LC_MESSAGES/django.po b/django/contrib/sessions/locale/fy/LC_MESSAGES/django.po
similarity index 100%
rename from django/contrib/sessions/locale/fy_NL/LC_MESSAGES/django.po
rename to django/contrib/sessions/locale/fy/LC_MESSAGES/django.po
diff --git a/django/contrib/sites/locale/fy_NL/LC_MESSAGES/django.mo b/django/contrib/sites/locale/fy/LC_MESSAGES/django.mo
similarity index 100%
rename from django/contrib/sites/locale/fy_NL/LC_MESSAGES/django.mo
rename to django/contrib/sites/locale/fy/LC_MESSAGES/django.mo
diff --git a/django/contrib/sites/locale/fy_NL/LC_MESSAGES/django.po b/django/contrib/sites/locale/fy/LC_MESSAGES/django.po
similarity index 100%
rename from django/contrib/sites/locale/fy_NL/LC_MESSAGES/django.po
rename to django/contrib/sites/locale/fy/LC_MESSAGES/django.po
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
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~