summaryrefslogtreecommitdiff
path: root/django/conf
diff options
context:
space:
mode:
authorPetter Reinholdtsen <pere@hungry.com>2016-01-16 11:24:57 +0100
committerTim Graham <timograham@gmail.com>2016-01-20 17:27:58 -0500
commita1fba4e843901eb35820c14d83a5d7d5622432fe (patch)
tree7191ba59b04510d783677a109bb35a324a1c1dad /django/conf
parent073dd4ce796441bf38388751817eb9f4c5514693 (diff)
Corrected English name of nb language.
Diffstat (limited to 'django/conf')
-rw-r--r--django/conf/global_settings.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py
index cbcf5b4ba0..5128a28079 100644
--- a/django/conf/global_settings.py
+++ b/django/conf/global_settings.py
@@ -1,3 +1,6 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
# Default Django settings. Override these with settings in the module
# pointed-to by the DJANGO_SETTINGS_MODULE environment variable.
@@ -104,7 +107,7 @@ LANGUAGES = [
('mn', gettext_noop('Mongolian')),
('mr', gettext_noop('Marathi')),
('my', gettext_noop('Burmese')),
- ('nb', gettext_noop('Norwegian Bokmal')),
+ ('nb', gettext_noop('Norwegian Bokmål')),
('ne', gettext_noop('Nepali')),
('nl', gettext_noop('Dutch')),
('nn', gettext_noop('Norwegian Nynorsk')),