Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #1907 from Bouke/tickets/21388

Fixed #21388 -- Corrected language code for Frisian
  • Loading branch information...
commit 0be7f57a9067c1596ece496e50a796b2529452bc 2 parents 5fda9c9 + 4142d15
@claudep claudep authored
Showing with 13 additions and 13 deletions.
  1. +1 −1  django/conf/global_settings.py
  2. +3 −3 django/conf/locale/__init__.py
  3. 0  django/conf/locale/{fy_NL → fy}/LC_MESSAGES/django.mo
  4. 0  django/conf/locale/{fy_NL → fy}/LC_MESSAGES/django.po
  5. 0  django/conf/locale/{fy_NL → fy}/__init__.py
  6. 0  django/conf/locale/{fy_NL → fy}/formats.py
  7. 0  django/contrib/admin/locale/{fy_NL → fy}/LC_MESSAGES/django.mo
  8. 0  django/contrib/admin/locale/{fy_NL → fy}/LC_MESSAGES/django.po
  9. 0  django/contrib/admin/locale/{fy_NL → fy}/LC_MESSAGES/djangojs.mo
  10. 0  django/contrib/admin/locale/{fy_NL → fy}/LC_MESSAGES/djangojs.po
  11. 0  django/contrib/admindocs/locale/{fy_NL → fy}/LC_MESSAGES/django.mo
  12. 0  django/contrib/admindocs/locale/{fy_NL → fy}/LC_MESSAGES/django.po
  13. 0  django/contrib/auth/locale/{fy_NL → fy}/LC_MESSAGES/django.mo
  14. 0  django/contrib/auth/locale/{fy_NL → fy}/LC_MESSAGES/django.po
  15. 0  django/contrib/comments/locale/{fy_NL → fy}/LC_MESSAGES/django.mo
  16. 0  django/contrib/comments/locale/{fy_NL → fy}/LC_MESSAGES/django.po
  17. 0  django/contrib/contenttypes/locale/{fy_NL → fy}/LC_MESSAGES/django.mo
  18. 0  django/contrib/contenttypes/locale/{fy_NL → fy}/LC_MESSAGES/django.po
  19. 0  django/contrib/flatpages/locale/{fy_NL → fy}/LC_MESSAGES/django.mo
  20. 0  django/contrib/flatpages/locale/{fy_NL → fy}/LC_MESSAGES/django.po
  21. 0  django/contrib/formtools/locale/{fy_NL → fy}/LC_MESSAGES/django.mo
  22. 0  django/contrib/formtools/locale/{fy_NL → fy}/LC_MESSAGES/django.po
  23. 0  django/contrib/gis/locale/{fy_NL → fy}/LC_MESSAGES/django.mo
  24. 0  django/contrib/gis/locale/{fy_NL → fy}/LC_MESSAGES/django.po
  25. 0  django/contrib/humanize/locale/{fy_NL → fy}/LC_MESSAGES/django.mo
  26. 0  django/contrib/humanize/locale/{fy_NL → fy}/LC_MESSAGES/django.po
  27. 0  django/contrib/messages/locale/{fy_NL → fy}/LC_MESSAGES/django.mo
  28. 0  django/contrib/messages/locale/{fy_NL → fy}/LC_MESSAGES/django.po
  29. 0  django/contrib/redirects/locale/{fy_NL → fy}/LC_MESSAGES/django.mo
  30. 0  django/contrib/redirects/locale/{fy_NL → fy}/LC_MESSAGES/django.po
  31. 0  django/contrib/sessions/locale/{fy_NL → fy}/LC_MESSAGES/django.mo
  32. 0  django/contrib/sessions/locale/{fy_NL → fy}/LC_MESSAGES/django.po
  33. 0  django/contrib/sites/locale/{fy_NL → fy}/LC_MESSAGES/django.mo
  34. 0  django/contrib/sites/locale/{fy_NL → fy}/LC_MESSAGES/django.po
  35. +9 −9 docs/releases/1.7.txt
View
2  django/conf/global_settings.py
@@ -75,7 +75,7 @@
('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')),
View
6 django/conf/locale/__init__.py
@@ -167,11 +167,11 @@
'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,
View
0  django/conf/locale/fy_NL/LC_MESSAGES/django.mo → django/conf/locale/fy/LC_MESSAGES/django.mo
File renamed without changes
View
0  django/conf/locale/fy_NL/LC_MESSAGES/django.po → django/conf/locale/fy/LC_MESSAGES/django.po
File renamed without changes
View
0  django/conf/locale/fy_NL/__init__.py → django/conf/locale/fy/__init__.py
File renamed without changes
View
0  django/conf/locale/fy_NL/formats.py → django/conf/locale/fy/formats.py
File renamed without changes
View
0  .../contrib/admin/locale/fy_NL/LC_MESSAGES/django.mo → django/contrib/admin/locale/fy/LC_MESSAGES/django.mo
File renamed without changes
View
0  .../contrib/admin/locale/fy_NL/LC_MESSAGES/django.po → django/contrib/admin/locale/fy/LC_MESSAGES/django.po
File renamed without changes
View
0  ...ontrib/admin/locale/fy_NL/LC_MESSAGES/djangojs.mo → ...o/contrib/admin/locale/fy/LC_MESSAGES/djangojs.mo
File renamed without changes
View
0  ...ontrib/admin/locale/fy_NL/LC_MESSAGES/djangojs.po → ...o/contrib/admin/locale/fy/LC_MESSAGES/djangojs.po
File renamed without changes
View
0  ...trib/admindocs/locale/fy_NL/LC_MESSAGES/django.mo → ...contrib/admindocs/locale/fy/LC_MESSAGES/django.mo
File renamed without changes
View
0  ...trib/admindocs/locale/fy_NL/LC_MESSAGES/django.po → ...contrib/admindocs/locale/fy/LC_MESSAGES/django.po
File renamed without changes
View
0  ...o/contrib/auth/locale/fy_NL/LC_MESSAGES/django.mo → django/contrib/auth/locale/fy/LC_MESSAGES/django.mo
File renamed without changes
View
0  ...o/contrib/auth/locale/fy_NL/LC_MESSAGES/django.po → django/contrib/auth/locale/fy/LC_MESSAGES/django.po
File renamed without changes
View
0  ...ntrib/comments/locale/fy_NL/LC_MESSAGES/django.mo → .../contrib/comments/locale/fy/LC_MESSAGES/django.mo
File renamed without changes
View
0  ...ntrib/comments/locale/fy_NL/LC_MESSAGES/django.po → .../contrib/comments/locale/fy/LC_MESSAGES/django.po
File renamed without changes
View
0  ...b/contenttypes/locale/fy_NL/LC_MESSAGES/django.mo → ...trib/contenttypes/locale/fy/LC_MESSAGES/django.mo
File renamed without changes
View
0  ...b/contenttypes/locale/fy_NL/LC_MESSAGES/django.po → ...trib/contenttypes/locale/fy/LC_MESSAGES/django.po
File renamed without changes
View
0  ...trib/flatpages/locale/fy_NL/LC_MESSAGES/django.mo → ...contrib/flatpages/locale/fy/LC_MESSAGES/django.mo
File renamed without changes
View
0  ...trib/flatpages/locale/fy_NL/LC_MESSAGES/django.po → ...contrib/flatpages/locale/fy/LC_MESSAGES/django.po
File renamed without changes
View
0  ...trib/formtools/locale/fy_NL/LC_MESSAGES/django.mo → ...contrib/formtools/locale/fy/LC_MESSAGES/django.mo
File renamed without changes
View
0  ...trib/formtools/locale/fy_NL/LC_MESSAGES/django.po → ...contrib/formtools/locale/fy/LC_MESSAGES/django.po
File renamed without changes
View
0  ...go/contrib/gis/locale/fy_NL/LC_MESSAGES/django.mo → django/contrib/gis/locale/fy/LC_MESSAGES/django.mo
File renamed without changes
View
0  ...go/contrib/gis/locale/fy_NL/LC_MESSAGES/django.po → django/contrib/gis/locale/fy/LC_MESSAGES/django.po
File renamed without changes
View
0  ...ntrib/humanize/locale/fy_NL/LC_MESSAGES/django.mo → .../contrib/humanize/locale/fy/LC_MESSAGES/django.mo
File renamed without changes
View
0  ...ntrib/humanize/locale/fy_NL/LC_MESSAGES/django.po → .../contrib/humanize/locale/fy/LC_MESSAGES/django.po
File renamed without changes
View
0  ...ntrib/messages/locale/fy_NL/LC_MESSAGES/django.mo → .../contrib/messages/locale/fy/LC_MESSAGES/django.mo
File renamed without changes
View
0  ...ntrib/messages/locale/fy_NL/LC_MESSAGES/django.po → .../contrib/messages/locale/fy/LC_MESSAGES/django.po
File renamed without changes
View
0  ...trib/redirects/locale/fy_NL/LC_MESSAGES/django.mo → ...contrib/redirects/locale/fy/LC_MESSAGES/django.mo
File renamed without changes
View
0  ...trib/redirects/locale/fy_NL/LC_MESSAGES/django.po → ...contrib/redirects/locale/fy/LC_MESSAGES/django.po
File renamed without changes
View
0  ...ntrib/sessions/locale/fy_NL/LC_MESSAGES/django.mo → .../contrib/sessions/locale/fy/LC_MESSAGES/django.mo
File renamed without changes
View
0  ...ntrib/sessions/locale/fy_NL/LC_MESSAGES/django.po → .../contrib/sessions/locale/fy/LC_MESSAGES/django.po
File renamed without changes
View
0  .../contrib/sites/locale/fy_NL/LC_MESSAGES/django.mo → django/contrib/sites/locale/fy/LC_MESSAGES/django.mo
File renamed without changes
View
0  .../contrib/sites/locale/fy_NL/LC_MESSAGES/django.po → django/contrib/sites/locale/fy/LC_MESSAGES/django.po
File renamed without changes
View
18 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``
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-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.
+Language codes ``zh-cn``, ``zh-tw`` and ``fy-nl``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+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
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Please sign in to comment.
Something went wrong with that request. Please try again.