35 files changed, 12 insertions, 12 deletions
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
index 169739a8da..169739a8da 100644
--- a/django/conf/locale/fy_NL/LC_MESSAGES/django.mo
+++ b/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
index 51da022bb8..51da022bb8 100644
--- a/django/conf/locale/fy_NL/LC_MESSAGES/django.po
+++ b/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
index e69de29bb2..e69de29bb2 100644
--- a/django/conf/locale/fy_NL/__init__.py
+++ b/django/conf/locale/fy/__init__.py
diff --git a/django/conf/locale/fy_NL/formats.py b/django/conf/locale/fy/formats.py
index 330c2f296e..330c2f296e 100644
--- a/django/conf/locale/fy_NL/formats.py
+++ b/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
index 16a9345b22..16a9345b22 100644
--- a/django/contrib/admin/locale/fy_NL/LC_MESSAGES/django.mo
+++ b/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
index 19db0c6753..19db0c6753 100644
--- a/django/contrib/admin/locale/fy_NL/LC_MESSAGES/django.po
+++ b/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
index 8f20b69ace..8f20b69ace 100644
--- a/django/contrib/admin/locale/fy_NL/LC_MESSAGES/djangojs.mo
+++ b/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
index f4e0e3e5fc..f4e0e3e5fc 100644
--- a/django/contrib/admin/locale/fy_NL/LC_MESSAGES/djangojs.po
+++ b/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
index 32ec1c587c..32ec1c587c 100644
--- a/django/contrib/admindocs/locale/fy_NL/LC_MESSAGES/django.mo
+++ b/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
index 2bae7a2697..2bae7a2697 100644
--- a/django/contrib/admindocs/locale/fy_NL/LC_MESSAGES/django.po
+++ b/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
index 52efd53504..52efd53504 100644
--- a/django/contrib/auth/locale/fy_NL/LC_MESSAGES/django.mo
+++ b/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
index 05c1d81e2f..05c1d81e2f 100644
--- a/django/contrib/auth/locale/fy_NL/LC_MESSAGES/django.po
+++ b/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
index b59ac52ad9..b59ac52ad9 100644
--- a/django/contrib/comments/locale/fy_NL/LC_MESSAGES/django.mo
+++ b/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
index 95473f5c1a..95473f5c1a 100644
--- a/django/contrib/comments/locale/fy_NL/LC_MESSAGES/django.po
+++ b/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
index 333b305905..333b305905 100644
--- a/django/contrib/contenttypes/locale/fy_NL/LC_MESSAGES/django.mo
+++ b/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
index 7ae27e596f..7ae27e596f 100644
--- a/django/contrib/contenttypes/locale/fy_NL/LC_MESSAGES/django.po
+++ b/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
index 0c56af7a50..0c56af7a50 100644
--- a/django/contrib/flatpages/locale/fy_NL/LC_MESSAGES/django.mo
+++ b/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
index 59fd8ee5c2..59fd8ee5c2 100644
--- a/django/contrib/flatpages/locale/fy_NL/LC_MESSAGES/django.po
+++ b/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
index 0294c28708..0294c28708 100644
--- a/django/contrib/formtools/locale/fy_NL/LC_MESSAGES/django.mo
+++ b/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
index 633c7fb086..633c7fb086 100644
--- a/django/contrib/formtools/locale/fy_NL/LC_MESSAGES/django.po
+++ b/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
index 3fb851a319..3fb851a319 100644
--- a/django/contrib/gis/locale/fy_NL/LC_MESSAGES/django.mo
+++ b/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
index 86bc66b9fe..86bc66b9fe 100644
--- a/django/contrib/gis/locale/fy_NL/LC_MESSAGES/django.po
+++ b/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
index 83e0b34884..83e0b34884 100644
--- a/django/contrib/humanize/locale/fy_NL/LC_MESSAGES/django.mo
+++ b/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
index 8b203f31d5..8b203f31d5 100644
--- a/django/contrib/humanize/locale/fy_NL/LC_MESSAGES/django.po
+++ b/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
index 9bb7836155..9bb7836155 100644
--- a/django/contrib/messages/locale/fy_NL/LC_MESSAGES/django.mo
+++ b/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
index f5173dc345..f5173dc345 100644
--- a/django/contrib/messages/locale/fy_NL/LC_MESSAGES/django.po
+++ b/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
index 41193759fa..41193759fa 100644
--- a/django/contrib/redirects/locale/fy_NL/LC_MESSAGES/django.mo
+++ b/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
index 4ff876fc92..4ff876fc92 100644
--- a/django/contrib/redirects/locale/fy_NL/LC_MESSAGES/django.po
+++ b/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
index e65dfaf502..e65dfaf502 100644
--- a/django/contrib/sessions/locale/fy_NL/LC_MESSAGES/django.mo
+++ b/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
index bdb9f3af8d..bdb9f3af8d 100644
--- a/django/contrib/sessions/locale/fy_NL/LC_MESSAGES/django.po
+++ b/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
index 38ee3475dd..38ee3475dd 100644
--- a/django/contrib/sites/locale/fy_NL/LC_MESSAGES/django.mo
+++ b/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
index 2148b7abca..2148b7abca 100644
--- a/django/contrib/sites/locale/fy_NL/LC_MESSAGES/django.po
+++ b/django/contrib/sites/locale/fy/LC_MESSAGES/django.po
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
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~