diff options
Diffstat (limited to 'django/conf')
| -rw-r--r-- | django/conf/global_settings.py | 2 | ||||
| -rw-r--r-- | django/conf/locale/__init__.py | 6 | ||||
| -rw-r--r-- | django/conf/locale/fy/LC_MESSAGES/django.mo (renamed from django/conf/locale/fy_NL/LC_MESSAGES/django.mo) | bin | 3220 -> 3220 bytes | |||
| -rw-r--r-- | django/conf/locale/fy/LC_MESSAGES/django.po (renamed from django/conf/locale/fy_NL/LC_MESSAGES/django.po) | 0 | ||||
| -rw-r--r-- | django/conf/locale/fy/__init__.py (renamed from django/conf/locale/fy_NL/__init__.py) | 0 | ||||
| -rw-r--r-- | django/conf/locale/fy/formats.py (renamed from django/conf/locale/fy_NL/formats.py) | 0 |
6 files changed, 4 insertions, 4 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 Binary files differindex 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 |