Skip to content

Commit

Permalink
fixes #989 - new 'no' translations for JavaScript
Browse files Browse the repository at this point in the history
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1534 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information
Georg Bauer committed Dec 4, 2005
1 parent 77e8f50 commit 4ef077c
Show file tree
Hide file tree
Showing 7 changed files with 90 additions and 3 deletions.
Binary file added django/conf/locale/no/LC_MESSAGES/djangojs.mo
Binary file not shown.
63 changes: 63 additions & 0 deletions django/conf/locale/no/LC_MESSAGES/djangojs.po
@@ -0,0 +1,63 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2005-12-04 13:32+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@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/admin/DateTimeShortcuts.js:45
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:80
msgid "Now"
msgstr "Nå"

#: contrib/admin/media/js/admin/DateTimeShortcuts.js:48
msgid "Clock"
msgstr "Klokke"

#: contrib/admin/media/js/admin/DateTimeShortcuts.js:77
msgid "Choose a time"
msgstr "Velg et klokkeslett"

#: contrib/admin/media/js/admin/DateTimeShortcuts.js:81
msgid "Midnight"
msgstr "24.00"

#: contrib/admin/media/js/admin/DateTimeShortcuts.js:82
msgid "6 a.m."
msgstr "18.00"

#: contrib/admin/media/js/admin/DateTimeShortcuts.js:83
msgid "Noon"
msgstr "12.00"

#: contrib/admin/media/js/admin/DateTimeShortcuts.js:87
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:168
msgid "Cancel"
msgstr "Avbryt"

#: contrib/admin/media/js/admin/DateTimeShortcuts.js:111
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:162
msgid "Today"
msgstr "I dag"

#: contrib/admin/media/js/admin/DateTimeShortcuts.js:114
msgid "Calendar"
msgstr "Kalender"

#: contrib/admin/media/js/admin/DateTimeShortcuts.js:160
msgid "Yesterday"
msgstr "I går"

#: contrib/admin/media/js/admin/DateTimeShortcuts.js:164
msgid "Tomorrow"
msgstr "I morgen"
6 changes: 6 additions & 0 deletions django/core/db/backends/ado_mssql.py
Expand Up @@ -132,6 +132,12 @@ def get_relations(cursor, table_name):
'endswith': 'LIKE %s',
'istartswith': 'LIKE %s',
'iendswith': 'LIKE %s',
'notcontains': 'NOT LIKE %s',
'notstartswith': 'NOT LIKE %s',
'notendswith': 'NOT LIKE %s',
'inotcontains': 'NOT LIKE %s',
'inotstartswith': 'NOT LIKE %s',
'inotendswith': 'NOT LIKE %s',
}

DATA_TYPES = {
Expand Down
6 changes: 6 additions & 0 deletions django/core/db/backends/mysql.py
Expand Up @@ -146,6 +146,12 @@ def get_relations(cursor, table_name):
'endswith': 'LIKE BINARY %s',
'istartswith': 'LIKE %s',
'iendswith': 'LIKE %s',
'notcontains': 'NOT LIKE BINARY %s',
'notstartswith': 'NOT LIKE BINARY %s',
'notendswith': 'NOT LIKE BINARY %s',
'inotcontains': 'NOT LIKE %s',
'inotstartswith': 'NOT LIKE %s',
'inotendswith': 'NOT LIKE %s',
}

# This dictionary maps Field objects to their associated MySQL column
Expand Down
6 changes: 6 additions & 0 deletions django/core/db/backends/postgresql.py
Expand Up @@ -151,6 +151,12 @@ def get_relations(cursor, table_name):
'endswith': 'LIKE %s',
'istartswith': 'ILIKE %s',
'iendswith': 'ILIKE %s',
'notcontains': 'NOT LIKE %s',
'notstartswith': 'NOT LIKE %s',
'notendswith': 'NOT LIKE %s',
'inotcontains': 'NOT ILIKE %s',
'inotstartswith': 'NOT ILIKE %s',
'inotendswith': 'NOT ILIKE %s',
}

# This dictionary maps Field objects to their associated PostgreSQL column
Expand Down
6 changes: 6 additions & 0 deletions django/core/db/backends/sqlite3.py
Expand Up @@ -153,6 +153,12 @@ def get_relations(cursor, table_name):
'endswith': "LIKE %s ESCAPE '\\'",
'istartswith': "LIKE %s ESCAPE '\\'",
'iendswith': "LIKE %s ESCAPE '\\'",
'notcontains': "NOT LIKE %s ESCAPE '\\'",
'notstartswith': "NOT LIKE %s ESCAPE '\\'",
'notendswith': "NOT LIKE %s ESCAPE '\\'",
'inotcontains': "NOT LIKE %s ESCAPE '\\'",
'inotstartswith': "NOT LIKE %s ESCAPE '\\'",
'inotendswith': "NOT LIKE %s ESCAPE '\\'",
}

# SQLite doesn't actually support most of these types, but it "does the right
Expand Down
6 changes: 3 additions & 3 deletions django/core/meta/fields.py
Expand Up @@ -181,13 +181,13 @@ def get_db_prep_lookup(self, lookup_type, value):
return value
elif lookup_type == 'year':
return ['%s-01-01' % value, '%s-12-31' % value]
elif lookup_type in ('contains', 'icontains'):
elif lookup_type in ('contains', 'icontains', 'notcontains', 'inotcontains'):
return ["%%%s%%" % prep_for_like_query(value)]
elif lookup_type == 'iexact':
return [prep_for_like_query(value)]
elif lookup_type in ('startswith', 'istartswith'):
elif lookup_type in ('startswith', 'istartswith', 'notstartswith', 'inotstartswith'):
return ["%s%%" % prep_for_like_query(value)]
elif lookup_type in ('endswith', 'iendswith'):
elif lookup_type in ('endswith', 'iendswith', 'notendswith', 'inotendswith'):
return ["%%%s" % prep_for_like_query(value)]
elif lookup_type == 'isnull':
return []
Expand Down

0 comments on commit 4ef077c

Please sign in to comment.