Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed #11068 - Introduced new language code "nb" for Norwegian Bokmål…

… as a replacement of the current "no".

git-svn-id: http://code.djangoproject.com/svn/django/trunk@13047 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 77c13844ae9f30ecc10b54cf0b1a338039aa7cea 1 parent df44485
@jezdez jezdez authored
View
1  django/conf/global_settings.py
@@ -78,6 +78,7 @@
('mk', gettext_noop('Macedonian')),
('nl', gettext_noop('Dutch')),
('no', gettext_noop('Norwegian')),
+ ('nb', gettext_noop('Norwegian Bokmal')),
('nn', gettext_noop('Norwegian Nynorsk')),
('pl', gettext_noop('Polish')),
('pt', gettext_noop('Portuguese')),
View
BIN  django/conf/locale/nb/LC_MESSAGES/django.mo
Binary file not shown
View
4,410 django/conf/locale/nb/LC_MESSAGES/django.po
4,410 additions, 0 deletions not shown
View
BIN  django/conf/locale/nb/LC_MESSAGES/djangojs.mo
Binary file not shown
View
118 django/conf/locale/nb/LC_MESSAGES/djangojs.po
@@ -0,0 +1,118 @@
+# translation of djangojs.po to norwegian
+# Copyright (C) 2005 and beyond
+# This file is distributed under the same license as the Django package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Django\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-12-09 11:51+0100\n"
+"PO-Revision-Date: 2008-08-29 16:12+0200\n"
+"Last-Translator: Christian Mikalsen and Jon Lønne\n"
+"Language-Team: Norsk <no@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: contrib/admin/media/js/SelectFilter2.js:33
+#, perl-format
+msgid "Available %s"
+msgstr "Tilgjengelige %s"
+
+#: contrib/admin/media/js/SelectFilter2.js:41
+msgid "Choose all"
+msgstr "Velg alle"
+
+#: contrib/admin/media/js/SelectFilter2.js:46
+msgid "Add"
+msgstr "Ny"
+
+#: contrib/admin/media/js/SelectFilter2.js:48
+msgid "Remove"
+msgstr "Slett"
+
+#: contrib/admin/media/js/SelectFilter2.js:53
+#, perl-format
+msgid "Chosen %s"
+msgstr "Valgte %s"
+
+#: contrib/admin/media/js/SelectFilter2.js:54
+msgid "Select your choice(s) and click "
+msgstr "Velg ditt valg og klikk "
+
+#: contrib/admin/media/js/SelectFilter2.js:59
+msgid "Clear all"
+msgstr "Fjern alle"
+
+#: contrib/admin/media/js/calendar.js:24
+#: contrib/admin/media/js/dateparse.js:32
+msgid ""
+"January February March April May June July August September October November "
+"December"
+msgstr ""
+"Januar Februar Mars April Mai Juni Juli August September Oktober November "
+"Desember"
+
+#: contrib/admin/media/js/calendar.js:25
+msgid "S M T W T F S"
+msgstr "S M T O T F L"
+
+#: contrib/admin/media/js/dateparse.js:33
+msgid "Sunday Monday Tuesday Wednesday Thursday Friday Saturday"
+msgstr "Søndag Mandag Tirsdag Onsdag Torsdag Fredag Lørdag"
+
+#: contrib/admin/media/js/admin/CollapsedFieldsets.js:34
+#: contrib/admin/media/js/admin/CollapsedFieldsets.js:72
+msgid "Show"
+msgstr "Vis"
+
+#: contrib/admin/media/js/admin/CollapsedFieldsets.js:63
+msgid "Hide"
+msgstr "Skjul"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:47
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:81
+msgid "Now"
+msgstr "Nå"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:51
+msgid "Clock"
+msgstr "Klokke"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:78
+msgid "Choose a time"
+msgstr "Velg et klokkeslett"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:82
+msgid "Midnight"
+msgstr "Midnatt"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:83
+msgid "6 a.m."
+msgstr "06:00"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:84
+msgid "Noon"
+msgstr "12:00"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:88
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:183
+msgid "Cancel"
+msgstr "Avbryt"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:128
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:177
+msgid "Today"
+msgstr "I dag"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:132
+msgid "Calendar"
+msgstr "Kalender"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:175
+msgid "Yesterday"
+msgstr "I går"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:179
+msgid "Tomorrow"
+msgstr "I morgen"
View
0  django/conf/locale/nb/__init__.py
No changes.
View
34 django/conf/locale/nb/formats.py
@@ -0,0 +1,34 @@
+DATE_FORMAT = 'j. F Y'
+TIME_FORMAT = 'H:i'
+DATETIME_FORMAT = 'j. F Y H:i'
+YEAR_MONTH_FORMAT = 'F Y'
+MONTH_DAY_FORMAT = 'j. F'
+SHORT_DATE_FORMAT = 'd.m.Y'
+SHORT_DATETIME_FORMAT = 'd.m.Y H:i'
+FIRST_DAY_OF_WEEK = 1 # Monday
+DATE_INPUT_FORMATS = (
+ '%Y-%m-%d', '%j.%m.%Y', '%j.%m.%y', # '2006-10-25', '25.10.2006', '25.10.06'
+ '%Y-%m-%j', # '2006-10-25',
+ # '%j. %b %Y', '%j %b %Y', # '25. okt 2006', '25 okt 2006'
+ # '%j. %b. %Y', '%j %b. %Y', # '25. okt. 2006', '25 okt. 2006'
+ # '%j. %B %Y', '%j %B %Y', # '25. oktober 2006', '25 oktober 2006'
+)
+TIME_INPUT_FORMATS = (
+ '%H:%M:%S', # '14:30:59'
+ '%H:%M', # '14:30'
+)
+DATETIME_INPUT_FORMATS = (
+ '%Y-%m-%d %H:%M:%S', # '2006-10-25 14:30:59'
+ '%Y-%m-%d %H:%M', # '2006-10-25 14:30'
+ '%Y-%m-%d', # '2006-10-25'
+ '%Y-%m-%j', # '2006-10-25'
+ '%j.%m.%Y %H:%M:%S', # '25.10.2006 14:30:59'
+ '%j.%m.%Y %H:%M', # '25.10.2006 14:30'
+ '%j.%m.%Y', # '25.10.2006'
+ '%j.%m.%y %H:%M:%S', # '25.10.06 14:30:59'
+ '%j.%m.%y %H:%M', # '25.10.06 14:30'
+ '%j.%m.%y', # '25.10.06'
+)
+DECIMAL_SEPARATOR = ','
+THOUSAND_SEPARATOR = ' '
+NUMBER_GROUPING = 3
View
5 django/conf/locale/no/LC_MESSAGES/django.po
@@ -1,5 +1,6 @@
-# translation of django.po to norwegian
-# Copyright (C) 2005 and beyond
+# This is the *old* Norwegian (Bokmål) translation of Django
+# For future updates please use the translation in the "nb" directory.
+# Copyright (C) 2005-2010
# This file is distributed under the same license as the Django package.
#
msgid ""
View
14 django/utils/translation/trans_real.py
@@ -184,6 +184,12 @@ def activate(language):
language and installs it as the current translation object for the current
thread.
"""
+ if isinstance(language, basestring) and language == 'no':
+ warnings.warn(
+ "The use of the language code 'no' is deprecated. "
+ "Please use the 'nb' translation instead.",
+ PendingDeprecationWarning
+ )
_active[currentThread()] = translation(language)
def deactivate():
@@ -504,8 +510,8 @@ def get_date_formats():
formats provided in the settings will be used.
"""
warnings.warn(
- '`django.utils.translation.get_date_formats` is deprecated. '
- 'Please update your code to use the new i18n aware formatting.',
+ "'django.utils.translation.get_date_formats' is deprecated. "
+ "Please update your code to use the new i18n aware formatting.",
PendingDeprecationWarning
)
from django.conf import settings
@@ -527,8 +533,8 @@ def get_partial_date_formats():
formats provided in the settings will be used.
"""
warnings.warn(
- '`django.utils.translation.get_partial_date_formats` is deprecated. '
- 'Please update your code to use the new i18n aware formatting.',
+ "'django.utils.translation.get_partial_date_formats' is deprecated. "
+ "Please update your code to use the new i18n aware formatting.",
PendingDeprecationWarning
)
from django.conf import settings
View
3  docs/internals/deprecation.txt
@@ -94,6 +94,9 @@ their deprecation, as per the :ref:`Django deprecation policy
* The ``postgresql`` database backend has been deprecated in favor of
the ``postgresql_psycopg2`` backend.
+ * The ``no`` language code has been deprecated in favor of the ``nb``
+ language code.
+
* 2.0
* ``django.views.defaults.shortcut()``. This function has been moved
to ``django.contrib.contenttypes.views.shortcut()`` as part of the
View
7 docs/releases/1.2.txt
@@ -764,3 +764,10 @@ Relaxed requirements for usernames
The built-in :class:`~django.contrib.auth.models.User` model's
:attr:`~django.contrib.auth.models.User.username` field now allows a wider range
of characters, including ``@``, ``+``, ``.`` and ``-`` characters.
+
+Deprecation of old language code ``no``
+---------------------------------------
+
+The currently used language code for Norwegian Bokmål ``no`` is being
+replaced by the more common language code ``nb``, which should be updated
+by translators from now on.
Please sign in to comment.
Something went wrong with that request. Please try again.