diff --git a/django/conf/locale/de/LC_MESSAGES/django.mo b/django/conf/locale/de/LC_MESSAGES/django.mo index 396036cb1a..df479567a9 100644 Binary files a/django/conf/locale/de/LC_MESSAGES/django.mo and b/django/conf/locale/de/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/de/LC_MESSAGES/django.po b/django/conf/locale/de/LC_MESSAGES/django.po index fef01a7a56..cb048542b6 100644 --- a/django/conf/locale/de/LC_MESSAGES/django.po +++ b/django/conf/locale/de/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Django 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-28 11:31+0100\n" +"POT-Creation-Date: 2005-12-04 13:13+0100\n" "PO-Revision-Date: 2005-10-08 00:03+0200\n" "Last-Translator: Georg Bauer \n" "MIME-Version: 1.0\n" @@ -74,7 +74,7 @@ msgstr "Datum/Zeit Erstellung" msgid "is public" msgstr "ist öffentlich" -#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:254 +#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:256 msgid "IP address" msgstr "IP-Adresse" @@ -412,55 +412,55 @@ msgstr "%s ausw msgid "Select %s to change" msgstr "%s zur Änderung auswählen" -#: contrib/admin/views/main.py:411 +#: contrib/admin/views/main.py:407 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s \"%(obj)s\" wurde erfolgreich hinzugefügt." -#: contrib/admin/views/main.py:416 contrib/admin/views/main.py:492 +#: contrib/admin/views/main.py:412 contrib/admin/views/main.py:488 msgid "You may edit it again below." msgstr "Das Element kann jetzt weiter geändert werden." -#: contrib/admin/views/main.py:424 contrib/admin/views/main.py:501 +#: contrib/admin/views/main.py:420 contrib/admin/views/main.py:497 #, python-format msgid "You may add another %s below." msgstr "Jetzt kann ein weiteres Element vom Typ %s angelegt werden." -#: contrib/admin/views/main.py:441 +#: contrib/admin/views/main.py:437 #, python-format msgid "Add %s" msgstr "%s zufügen" -#: contrib/admin/views/main.py:457 +#: contrib/admin/views/main.py:453 #, python-format msgid "Added %s." msgstr "%s hinzugefügt." -#: contrib/admin/views/main.py:457 contrib/admin/views/main.py:459 -#: contrib/admin/views/main.py:461 +#: contrib/admin/views/main.py:453 contrib/admin/views/main.py:455 +#: contrib/admin/views/main.py:457 msgid "and" msgstr "und" -#: contrib/admin/views/main.py:459 +#: contrib/admin/views/main.py:455 #, python-format msgid "Changed %s." msgstr "%s geändert" -#: contrib/admin/views/main.py:461 +#: contrib/admin/views/main.py:457 #, python-format msgid "Deleted %s." msgstr "%s gelöscht." -#: contrib/admin/views/main.py:464 +#: contrib/admin/views/main.py:460 msgid "No fields changed." msgstr "Keine Felder geändert." -#: contrib/admin/views/main.py:489 +#: contrib/admin/views/main.py:485 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\" wurde erfolgreich geändert." -#: contrib/admin/views/main.py:498 +#: contrib/admin/views/main.py:494 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." @@ -468,111 +468,151 @@ msgstr "" "%(name)s \"%(obj)s\" wurde erfolgreich zugefügt. Das Element kann jetzt " "geändert werden." -#: contrib/admin/views/main.py:536 +#: contrib/admin/views/main.py:532 #, python-format msgid "Change %s" msgstr "%s ändern" -#: contrib/admin/views/main.py:614 +#: contrib/admin/views/main.py:610 #, python-format msgid "One or more %(fieldname)s in %(name)s: %(obj)s" msgstr "Ein oder mehrere %(fieldname)s in %(name)s: %(obj)s" -#: contrib/admin/views/main.py:619 +#: contrib/admin/views/main.py:615 #, python-format msgid "One or more %(fieldname)s in %(name)s:" msgstr "Ein oder mehrere %(fieldname)s in %(name)s:" -#: contrib/admin/views/main.py:648 +#: contrib/admin/views/main.py:644 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "%(name)s \"%(obj)s\" wurde erfolgreich gelöscht." -#: contrib/admin/views/main.py:651 +#: contrib/admin/views/main.py:647 msgid "Are you sure?" msgstr "Sicher? Ganz sicher?" -#: contrib/admin/views/main.py:666 +#: contrib/admin/views/main.py:662 #, python-format msgid "Change history: %s" msgstr "Änderungsgeschichte: %s" -#: contrib/admin/views/doc.py:242 contrib/admin/views/doc.py:251 -#: contrib/admin/views/doc.py:253 contrib/admin/views/doc.py:258 -#: contrib/admin/views/doc.py:259 contrib/admin/views/doc.py:261 +#: contrib/admin/views/doc.py:244 contrib/admin/views/doc.py:253 +#: contrib/admin/views/doc.py:255 contrib/admin/views/doc.py:261 +#: contrib/admin/views/doc.py:262 contrib/admin/views/doc.py:264 msgid "Integer" msgstr "Ganzzahl" -#: contrib/admin/views/doc.py:243 +#: contrib/admin/views/doc.py:245 msgid "Boolean (Either True or False)" msgstr "Wahrheitswert (Wahr oder Falsch)" -#: contrib/admin/views/doc.py:244 +#: contrib/admin/views/doc.py:246 #, python-format msgid "String (up to %(maxlength)s)" msgstr "Zeichenkette (bis zu %(maxlength)s Zeichen)" -#: contrib/admin/views/doc.py:245 +#: contrib/admin/views/doc.py:247 msgid "Comma-separated integers" msgstr "Kommaseparierte Liste von Zahlen" -#: contrib/admin/views/doc.py:246 +#: contrib/admin/views/doc.py:248 msgid "Date (without time)" msgstr "Datum (ohne Zeit)" -#: contrib/admin/views/doc.py:247 +#: contrib/admin/views/doc.py:249 msgid "Date (with time)" msgstr "Datum (mit Zeit)" -#: contrib/admin/views/doc.py:248 +#: contrib/admin/views/doc.py:250 msgid "E-mail address" msgstr "E-mail-Adresse" -#: contrib/admin/views/doc.py:249 contrib/admin/views/doc.py:252 +#: contrib/admin/views/doc.py:251 contrib/admin/views/doc.py:254 msgid "File path" msgstr "Dateipfad" -#: contrib/admin/views/doc.py:250 +#: contrib/admin/views/doc.py:252 msgid "Decimal number" msgstr "Dezimalzahl" -#: contrib/admin/views/doc.py:256 +#: contrib/admin/views/doc.py:258 msgid "Boolean (Either True, False or None)" msgstr "Wahrheitswert (Wahr, Falsch oder Nichts)" -#: contrib/admin/views/doc.py:257 +#: contrib/admin/views/doc.py:259 +msgid "Relation to parent model" +msgstr "Beziehung zum Übermodell" + +#: contrib/admin/views/doc.py:260 msgid "Phone number" msgstr "Telefonnummer" -#: contrib/admin/views/doc.py:260 +#: contrib/admin/views/doc.py:263 msgid "String (up to 50)" msgstr "Zeichenkette (bis zu 50 Zeichen)" -#: contrib/admin/views/doc.py:262 +#: contrib/admin/views/doc.py:265 msgid "Text" msgstr "Text" -#: contrib/admin/views/doc.py:263 +#: contrib/admin/views/doc.py:266 msgid "Time" msgstr "Zeit" -#: contrib/admin/views/doc.py:264 contrib/flatpages/models/flatpages.py:6 +#: contrib/admin/views/doc.py:267 contrib/flatpages/models/flatpages.py:6 msgid "URL" msgstr "URL" -#: contrib/admin/views/doc.py:265 +#: contrib/admin/views/doc.py:268 msgid "U.S. state (two uppercase letters)" msgstr "U.S. Bundesstaat (zwei Grossbuchstaben)" -#: contrib/admin/views/doc.py:266 +#: contrib/admin/views/doc.py:269 msgid "XML text" msgstr "XML Text" +#: contrib/admin/templates/admin/object_history.html:3 +#: contrib/admin/templates/admin/change_list.html:4 +#: contrib/admin/templates/admin/base.html:23 +#: contrib/admin/templates/admin/delete_confirmation.html:3 +#: contrib/admin/templates/admin/change_form.html:8 +#: contrib/admin/templates/admin_doc/bookmarklets.html:4 +#: contrib/admin/templates/admin_doc/view_detail.html:4 +#: contrib/admin/templates/admin_doc/template_tag_index.html:5 +#: contrib/admin/templates/admin_doc/template_detail.html:4 +#: contrib/admin/templates/admin_doc/template_filter_index.html:5 +#: contrib/admin/templates/admin_doc/missing_docutils.html:4 +#: contrib/admin/templates/admin_doc/view_index.html:5 +#: contrib/admin/templates/admin_doc/model_detail.html:3 +#: contrib/admin/templates/admin_doc/index.html:4 +#: contrib/admin/templates/admin_doc/model_index.html:5 +msgid "Change password" +msgstr "Passwort ändern" + +#: contrib/admin/templates/admin/object_history.html:3 +#: contrib/admin/templates/admin/change_list.html:4 +#: contrib/admin/templates/admin/base.html:23 +#: contrib/admin/templates/admin/delete_confirmation.html:3 +#: contrib/admin/templates/admin/change_form.html:8 +#: contrib/admin/templates/admin_doc/bookmarklets.html:4 +#: contrib/admin/templates/admin_doc/view_detail.html:4 +#: contrib/admin/templates/admin_doc/template_tag_index.html:5 +#: contrib/admin/templates/admin_doc/template_detail.html:4 +#: contrib/admin/templates/admin_doc/template_filter_index.html:5 +#: contrib/admin/templates/admin_doc/missing_docutils.html:4 +#: contrib/admin/templates/admin_doc/view_index.html:5 +#: contrib/admin/templates/admin_doc/model_detail.html:3 +#: contrib/admin/templates/admin_doc/index.html:4 +#: contrib/admin/templates/admin_doc/model_index.html:5 +msgid "Log out" +msgstr "Abmelden" + #: contrib/admin/templates/admin/object_history.html:5 #: contrib/admin/templates/admin/500.html:4 -#: contrib/admin/templates/admin/change_list.html:4 +#: contrib/admin/templates/admin/change_list.html:5 #: contrib/admin/templates/admin/base.html:29 -#: contrib/admin/templates/admin/change_form.html:10 +#: contrib/admin/templates/admin/change_form.html:11 #: contrib/admin/templates/registration/password_change_done.html:4 #: contrib/admin/templates/registration/password_reset_form.html:4 #: contrib/admin/templates/registration/logged_out.html:4 @@ -583,7 +623,7 @@ msgid "Home" msgstr "Start" #: contrib/admin/templates/admin/object_history.html:5 -#: contrib/admin/templates/admin/change_form.html:17 +#: contrib/admin/templates/admin/change_form.html:18 msgid "History" msgstr "Geschichte" @@ -651,7 +691,7 @@ msgstr "" "Es tut uns leid, aber die angeforderte Seite kann nicht gefunden werden." #: contrib/admin/templates/admin/index.html:27 -#: contrib/admin/templates/admin/change_form.html:12 +#: contrib/admin/templates/admin/change_form.html:13 msgid "Add" msgstr "Zufügen" @@ -675,7 +715,7 @@ msgstr "Meine Aktionen" msgid "None available" msgstr "Keine vorhanden" -#: contrib/admin/templates/admin/change_list.html:9 +#: contrib/admin/templates/admin/change_list.html:10 #, python-format msgid "Add %(name)s" msgstr "%(name)s zufügen" @@ -696,15 +736,7 @@ msgstr "Haben Sie ihr Passwort vergessen?" msgid "Welcome," msgstr "Willkommen," -#: contrib/admin/templates/admin/base.html:23 -msgid "Change password" -msgstr "Passwort ändern" - -#: contrib/admin/templates/admin/base.html:23 -msgid "Log out" -msgstr "Abmelden" - -#: contrib/admin/templates/admin/delete_confirmation.html:7 +#: contrib/admin/templates/admin/delete_confirmation.html:6 #, python-format msgid "" "Deleting the %(object_name)s '%(object)s' would result in deleting related " @@ -715,7 +747,7 @@ msgstr "" "abhängigen Daten zur Folge, aber Sie haben nicht die nötigen Rechte um die " "folgenden abhängigen Daten zu löschen:" -#: contrib/admin/templates/admin/delete_confirmation.html:14 +#: contrib/admin/templates/admin/delete_confirmation.html:13 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of " @@ -724,7 +756,7 @@ msgstr "" "Sind Sie sicher, das Sie %(object_name)s \"%(object)s\" löschen wollen? Es " "werden zusätzlich die folgenden abhängigen Daten mit gelöscht:" -#: contrib/admin/templates/admin/delete_confirmation.html:18 +#: contrib/admin/templates/admin/delete_confirmation.html:17 msgid "Yes, I'm sure" msgstr "Ja, ich bin sicher" @@ -737,21 +769,21 @@ msgstr " Nach %(title)s " msgid "Go" msgstr "Los" -#: contrib/admin/templates/admin/change_form.html:18 +#: contrib/admin/templates/admin/change_form.html:19 msgid "View on site" msgstr "Im Web Anzeigen" -#: contrib/admin/templates/admin/change_form.html:26 +#: contrib/admin/templates/admin/change_form.html:27 msgid "Please correct the error below." msgid_plural "Please correct the errors below." msgstr[0] "Bitte den Fehler korrigieren." msgstr[1] "Bitte die Fehler korrigieren." -#: contrib/admin/templates/admin/change_form.html:43 +#: contrib/admin/templates/admin/change_form.html:44 msgid "Ordering" msgstr "Sortierung" -#: contrib/admin/templates/admin/change_form.html:46 +#: contrib/admin/templates/admin/change_form.html:47 msgid "Order:" msgstr "Reihenfolge:" @@ -966,6 +998,14 @@ msgid "As above, but opens the admin page in a new window." msgstr "" "Wie zuvor, aber öffnent die Administrationsseite in einem neuen Fenster." +#: contrib/admin/templates/widget/date_time.html:3 +msgid "Date:" +msgstr "Datum:" + +#: contrib/admin/templates/widget/date_time.html:4 +msgid "Time:" +msgstr "Zeit:" + #: contrib/redirects/models/redirects.py:7 msgid "redirect from" msgstr "Umleitung von" @@ -1045,15 +1085,15 @@ msgstr "Webseite" msgid "flat pages" msgstr "Webseiten" -#: utils/translation.py:335 +#: utils/translation.py:350 msgid "DATE_FORMAT" msgstr "j. N Y" -#: utils/translation.py:336 +#: utils/translation.py:351 msgid "DATETIME_FORMAT" msgstr "j. N Y, H:i" -#: utils/translation.py:337 +#: utils/translation.py:352 msgid "TIME_FORMAT" msgstr "H:i" @@ -1773,4 +1813,3 @@ msgstr[1] "" #: core/template/defaultfilters.py:354 msgid "yes,no,maybe" msgstr "Ja,Nein,Vielleicht" - diff --git a/django/conf/locale/de/LC_MESSAGES/djangojs.mo b/django/conf/locale/de/LC_MESSAGES/djangojs.mo new file mode 100644 index 0000000000..7bf67aed66 Binary files /dev/null and b/django/conf/locale/de/LC_MESSAGES/djangojs.mo differ diff --git a/django/conf/locale/de/LC_MESSAGES/djangojs.po b/django/conf/locale/de/LC_MESSAGES/djangojs.po new file mode 100644 index 0000000000..7bafa55d72 --- /dev/null +++ b/django/conf/locale/de/LC_MESSAGES/djangojs.po @@ -0,0 +1,62 @@ +# 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 , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: Django JavaScript 1.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2005-12-04 13:29+0100\n" +"PO-Revision-Date: 2005-12-04 13:21+0100\n" +"Last-Translator: Georg Bauer \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=iso-8859-1\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 "Jetzt" + +#: contrib/admin/media/js/admin/DateTimeShortcuts.js:48 +msgid "Clock" +msgstr "Uhr" + +#: contrib/admin/media/js/admin/DateTimeShortcuts.js:77 +msgid "Choose a time" +msgstr "Uhrzeit" + +#: contrib/admin/media/js/admin/DateTimeShortcuts.js:81 +msgid "Midnight" +msgstr "Mitternacht" + +#: contrib/admin/media/js/admin/DateTimeShortcuts.js:82 +msgid "6 a.m." +msgstr "6 Uhr" + +#: contrib/admin/media/js/admin/DateTimeShortcuts.js:83 +msgid "Noon" +msgstr "Mittag" + +#: contrib/admin/media/js/admin/DateTimeShortcuts.js:87 +#: contrib/admin/media/js/admin/DateTimeShortcuts.js:168 +msgid "Cancel" +msgstr "Abbruch" + +#: contrib/admin/media/js/admin/DateTimeShortcuts.js:111 +#: contrib/admin/media/js/admin/DateTimeShortcuts.js:162 +msgid "Today" +msgstr "Heute" + +#: contrib/admin/media/js/admin/DateTimeShortcuts.js:114 +msgid "Calendar" +msgstr "Kalender" + +#: contrib/admin/media/js/admin/DateTimeShortcuts.js:160 +msgid "Yesterday" +msgstr "Gestern" + +#: contrib/admin/media/js/admin/DateTimeShortcuts.js:164 +msgid "Tomorrow" +msgstr "Morgen" diff --git a/django/conf/locale/en/LC_MESSAGES/djangojs.mo b/django/conf/locale/en/LC_MESSAGES/djangojs.mo new file mode 100644 index 0000000000..b35f3ec577 Binary files /dev/null and b/django/conf/locale/en/LC_MESSAGES/djangojs.mo differ diff --git a/django/conf/locale/en/LC_MESSAGES/djangojs.po b/django/conf/locale/en/LC_MESSAGES/djangojs.po new file mode 100644 index 0000000000..b1917b471b --- /dev/null +++ b/django/conf/locale/en/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 , 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 \n" +"Language-Team: LANGUAGE \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 "" + +#: contrib/admin/media/js/admin/DateTimeShortcuts.js:48 +msgid "Clock" +msgstr "" + +#: contrib/admin/media/js/admin/DateTimeShortcuts.js:77 +msgid "Choose a time" +msgstr "" + +#: contrib/admin/media/js/admin/DateTimeShortcuts.js:81 +msgid "Midnight" +msgstr "" + +#: contrib/admin/media/js/admin/DateTimeShortcuts.js:82 +msgid "6 a.m." +msgstr "" + +#: contrib/admin/media/js/admin/DateTimeShortcuts.js:83 +msgid "Noon" +msgstr "" + +#: contrib/admin/media/js/admin/DateTimeShortcuts.js:87 +#: contrib/admin/media/js/admin/DateTimeShortcuts.js:168 +msgid "Cancel" +msgstr "" + +#: contrib/admin/media/js/admin/DateTimeShortcuts.js:111 +#: contrib/admin/media/js/admin/DateTimeShortcuts.js:162 +msgid "Today" +msgstr "" + +#: contrib/admin/media/js/admin/DateTimeShortcuts.js:114 +msgid "Calendar" +msgstr "" + +#: contrib/admin/media/js/admin/DateTimeShortcuts.js:160 +msgid "Yesterday" +msgstr "" + +#: contrib/admin/media/js/admin/DateTimeShortcuts.js:164 +msgid "Tomorrow" +msgstr "" diff --git a/django/contrib/admin/media/js/admin/DateTimeShortcuts.js b/django/contrib/admin/media/js/admin/DateTimeShortcuts.js index 85482c4cd5..28511f76c6 100644 --- a/django/contrib/admin/media/js/admin/DateTimeShortcuts.js +++ b/django/contrib/admin/media/js/admin/DateTimeShortcuts.js @@ -43,10 +43,10 @@ var DateTimeShortcuts = { inp.parentNode.insertBefore(shortcuts_span, inp.nextSibling); var now_link = document.createElement('a'); now_link.setAttribute('href', "javascript:DateTimeShortcuts.handleClockQuicklink(" + num + ", new Date().getHourMinute());"); - now_link.appendChild(document.createTextNode('Now')); + now_link.appendChild(document.createTextNode(gettext('Now'))); var clock_link = document.createElement('a'); clock_link.setAttribute('href', 'javascript:DateTimeShortcuts.openClock(' + num + ');'); - quickElement('img', clock_link, '', 'src', DateTimeShortcuts.admin_media_prefix + 'img/admin/icon_clock.gif', 'alt', 'Clock'); + quickElement('img', clock_link, '', 'src', DateTimeShortcuts.admin_media_prefix + 'img/admin/icon_clock.gif', 'alt', gettext('Clock')); shortcuts_span.appendChild(document.createTextNode('\240')); shortcuts_span.appendChild(now_link); shortcuts_span.appendChild(document.createTextNode('\240|\240')); @@ -76,17 +76,17 @@ var DateTimeShortcuts = { document.body.appendChild(clock_box); addEvent(clock_box, 'click', DateTimeShortcuts.cancelEventPropagation); - quickElement('h2', clock_box, 'Choose a time'); + quickElement('h2', clock_box, gettext('Choose a time')); time_list = quickElement('ul', clock_box, ''); time_list.className = 'timelist'; - quickElement("a", quickElement("li", time_list, ""), "Now", "href", "javascript:DateTimeShortcuts.handleClockQuicklink(" + num + ", new Date().getHourMinute());") - quickElement("a", quickElement("li", time_list, ""), "Midnight", "href", "javascript:DateTimeShortcuts.handleClockQuicklink(" + num + ", '00:00');") - quickElement("a", quickElement("li", time_list, ""), "6 a.m.", "href", "javascript:DateTimeShortcuts.handleClockQuicklink(" + num + ", '06:00');") - quickElement("a", quickElement("li", time_list, ""), "Noon", "href", "javascript:DateTimeShortcuts.handleClockQuicklink(" + num + ", '12:00');") + quickElement("a", quickElement("li", time_list, ""), gettext("Now"), "href", "javascript:DateTimeShortcuts.handleClockQuicklink(" + num + ", new Date().getHourMinute());") + quickElement("a", quickElement("li", time_list, ""), gettext("Midnight"), "href", "javascript:DateTimeShortcuts.handleClockQuicklink(" + num + ", '00:00');") + quickElement("a", quickElement("li", time_list, ""), gettext("6 a.m."), "href", "javascript:DateTimeShortcuts.handleClockQuicklink(" + num + ", '06:00');") + quickElement("a", quickElement("li", time_list, ""), gettext("Noon"), "href", "javascript:DateTimeShortcuts.handleClockQuicklink(" + num + ", '12:00');") cancel_p = quickElement('p', clock_box, ''); cancel_p.className = 'calendar-cancel'; - quickElement('a', cancel_p, 'Cancel', 'href', 'javascript:DateTimeShortcuts.dismissClock(' + num + ');'); + quickElement('a', cancel_p, gettext('Cancel'), 'href', 'javascript:DateTimeShortcuts.dismissClock(' + num + ');'); }, openClock: function(num) { document.getElementById(DateTimeShortcuts.clockDivName + num).style.display = 'block'; @@ -111,10 +111,10 @@ var DateTimeShortcuts = { inp.parentNode.insertBefore(shortcuts_span, inp.nextSibling); var today_link = document.createElement('a'); today_link.setAttribute('href', 'javascript:DateTimeShortcuts.handleCalendarQuickLink(' + num + ', 0);'); - today_link.appendChild(document.createTextNode('Today')); + today_link.appendChild(document.createTextNode(gettext('Today'))); var cal_link = document.createElement('a'); cal_link.setAttribute('href', 'javascript:DateTimeShortcuts.openCalendar(' + num + ');'); - quickElement('img', cal_link, '', 'src', DateTimeShortcuts.admin_media_prefix + 'img/admin/icon_calendar.gif', 'alt', 'Calendar'); + quickElement('img', cal_link, '', 'src', DateTimeShortcuts.admin_media_prefix + 'img/admin/icon_calendar.gif', 'alt', gettext('Calendar')); shortcuts_span.appendChild(document.createTextNode('\240')); shortcuts_span.appendChild(today_link); shortcuts_span.appendChild(document.createTextNode('\240|\240')); @@ -164,16 +164,16 @@ var DateTimeShortcuts = { // calendar shortcuts var shortcuts = quickElement('div', cal_box, ''); shortcuts.className = 'calendar-shortcuts'; - quickElement('a', shortcuts, 'Yesterday', 'href', 'javascript:DateTimeShortcuts.handleCalendarQuickLink(' + num + ', -1);'); + quickElement('a', shortcuts, gettext('Yesterday'), 'href', 'javascript:DateTimeShortcuts.handleCalendarQuickLink(' + num + ', -1);'); shortcuts.appendChild(document.createTextNode('\240|\240')); - quickElement('a', shortcuts, 'Today', 'href', 'javascript:DateTimeShortcuts.handleCalendarQuickLink(' + num + ', 0);'); + quickElement('a', shortcuts, gettext('Today'), 'href', 'javascript:DateTimeShortcuts.handleCalendarQuickLink(' + num + ', 0);'); shortcuts.appendChild(document.createTextNode('\240|\240')); - quickElement('a', shortcuts, 'Tomorrow', 'href', 'javascript:DateTimeShortcuts.handleCalendarQuickLink(' + num + ', +1);'); + quickElement('a', shortcuts, gettext('Tomorrow'), 'href', 'javascript:DateTimeShortcuts.handleCalendarQuickLink(' + num + ', +1);'); // cancel bar var cancel_p = quickElement('p', cal_box, ''); cancel_p.className = 'calendar-cancel'; - quickElement('a', cancel_p, 'Cancel', 'href', 'javascript:DateTimeShortcuts.dismissCalendar(' + num + ');'); + quickElement('a', cancel_p, gettext('Cancel'), 'href', 'javascript:DateTimeShortcuts.dismissCalendar(' + num + ');'); }, openCalendar: function(num) { document.getElementById(DateTimeShortcuts.calendarDivName1+num).style.display = 'block'; diff --git a/django/contrib/admin/templates/admin/change_form.html b/django/contrib/admin/templates/admin/change_form.html index 8ef9b3da82..1526e2b37e 100644 --- a/django/contrib/admin/templates/admin/change_form.html +++ b/django/contrib/admin/templates/admin/change_form.html @@ -1,6 +1,7 @@ {% extends "admin/base_site" %} {% load i18n admin_modify adminmedia %} {% block extrahead %} + {% for js in bound_manipulator.javascript_imports %}{% include_admin_script js %}{% endfor %} {% endblock %} {% block coltype %}{{ bound_manipulator.coltype }}{% endblock %} diff --git a/django/contrib/admin/templates/widget/date_time.html b/django/contrib/admin/templates/widget/date_time.html index 2d5126c5bb..cbd4a2e1c6 100644 --- a/django/contrib/admin/templates/widget/date_time.html +++ b/django/contrib/admin/templates/widget/date_time.html @@ -1,4 +1,5 @@ +{% load i18n %}

- Date: {{ bound_field.form_fields.0 }}
- Time: {{ bound_field.form_fields.1 }} + {% trans "Date:" %} {{ bound_field.form_fields.0 }}
+ {% trans "Time:" %} {{ bound_field.form_fields.1 }}

diff --git a/django/contrib/admin/urls/admin.py b/django/contrib/admin/urls/admin.py index d03b88ceb4..3f4dbab419 100644 --- a/django/contrib/admin/urls/admin.py +++ b/django/contrib/admin/urls/admin.py @@ -3,6 +3,7 @@ from django.conf.settings import INSTALLED_APPS urlpatterns = ( ('^$', 'django.contrib.admin.views.main.index'), + ('^jsi18n/$', 'django.views.i18n.javascript_catalog', {'packages': 'django.conf'}), ('^logout/$', 'django.views.auth.login.logout'), ('^password_change/$', 'django.views.registration.passwords.password_change'), ('^password_change/done/$', 'django.views.registration.passwords.password_change_done'),