Changeset 1530

Timestamp:

12/04/05 06:30:14 (3 years ago)

Author:

hugo

Message:

first take at admin JavaScript? translation - translation hooks for the calendar and time picker are added and the german translation is updated

Files:

• django/trunk/django/conf/locale/de/LC_MESSAGES/djangojs.mo (added)
• django/trunk/django/conf/locale/de/LC_MESSAGES/djangojs.po (added)
• django/trunk/django/conf/locale/de/LC_MESSAGES/django.mo (modified) (previous)
• django/trunk/django/conf/locale/de/LC_MESSAGES/django.po (modified) (15 diffs)
• django/trunk/django/conf/locale/en/LC_MESSAGES/djangojs.mo (added)
• django/trunk/django/conf/locale/en/LC_MESSAGES/djangojs.po (added)
• django/trunk/django/contrib/admin/media/js/admin/DateTimeShortcuts.js (modified) (4 diffs)
• django/trunk/django/contrib/admin/templates/admin/change_form.html (modified) (1 diff)
• django/trunk/django/contrib/admin/templates/widget/date_time.html (modified) (1 diff)
• django/trunk/django/contrib/admin/urls/admin.py (modified) (1 diff)

django/trunk/django/conf/locale/de/LC_MESSAGES/django.po

@@ -8 +8 @@
-"Project-Id-Version: Django 1.0\n"
-"Report-Msgid-Bugs-To: \n"
-1-28 11:31
+2-04 13:13
-"PO-Revision-Date: 2005-10-08 00:03+0200\n"
-"Last-Translator: Georg Bauer <gb@bofh.ms>\n"
@@ -75 +75 @@
-msgstr "ist �ntlich"
-
-4
+6
-msgid "IP address"
-msgstr "IP-Adresse"
@@ -413 +413 @@
-msgstr "%s zur �derung ausw�en"
-
-11
+07
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "%(name)s \"%(obj)s\" wurde erfolgreich hinzugef�
-6 contrib/admin/views/main.py:492
+2 contrib/admin/views/main.py:488
-msgid "You may edit it again below."
-msgstr "Das Element kann jetzt weiter ge�ert werden."
-
-4 contrib/admin/views/main.py:501
+0 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."
-
-41
+37
-#, python-format
-msgid "Add %s"
-msgstr "%s zuf�
-7
+3
-#, python-format
-msgid "Added %s."
-msgstr "%s hinzugef�
-7 contrib/admin/views/main.py:459
-61
+3 contrib/admin/views/main.py:455
+57
-msgid "and"
-msgstr "und"
-
-9
+5
-#, python-format
-msgid "Changed %s."
-msgstr "%s ge�ert"
-
-61
+57
-#, python-format
-msgid "Deleted %s."
-msgstr "%s gel�t."
-
-4
+0
-msgid "No fields changed."
-msgstr "Keine Felder ge�ert."
-
-9
+5
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "%(name)s \"%(obj)s\" wurde erfolgreich ge�ert."
-
-8
+4
-#, python-format
-msgid ""
@@ -466 +466 @@
-"ge�ert werden."
-
-6
+2
-#, python-format
-msgid "Change %s"
-msgstr "%s �ern"
-
-4
+0
-#, python-format
-msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
-msgstr "Ein oder mehrere %(fieldname)s in %(name)s: %(obj)s"
-
-9
+5
-#, python-format
-msgid "One or more %(fieldname)s in %(name)s:"
-msgstr "Ein oder mehrere %(fieldname)s in %(name)s:"
-
-8
+4
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was deleted successfully."
-msgstr "%(name)s \"%(obj)s\" wurde erfolgreich gel�t."
-
-51
+47
-msgid "Are you sure?"
-msgstr "Sicher? Ganz sicher?"
-
-6
+2
-#, python-format
-msgid "Change history: %s"
-msgstr "�derungsgeschichte: %s"
-
-2 contrib/admin/views/doc.py:251
-3 contrib/admin/views/doc.py:258
-59 contrib/admin/views/doc.py:261
+4 contrib/admin/views/doc.py:253
+5 contrib/admin/views/doc.py:261
+62 contrib/admin/views/doc.py:264
-msgid "Integer"
-msgstr "Ganzzahl"
-
-3
+5
-msgid "Boolean (Either True or False)"
-msgstr "Wahrheitswert (Wahr oder Falsch)"
-
-4
+6
-#, python-format
-msgid "String (up to %(maxlength)s)"
-msgstr "Zeichenkette (bis zu %(maxlength)s Zeichen)"
-
-5
+7
-msgid "Comma-separated integers"
-msgstr "Kommaseparierte Liste von Zahlen"
-
-6
+8
-msgid "Date (without time)"
-msgstr "Datum (ohne Zeit)"
-
-7
+9
-msgid "Date (with time)"
-msgstr "Datum (mit Zeit)"
-
-48
+50
-msgid "E-mail address"
-msgstr "E-mail-Adresse"
-
-49 contrib/admin/views/doc.py:252
+51 contrib/admin/views/doc.py:254
-msgid "File path"
-msgstr "Dateipfad"
-
-0
+2
-msgid "Decimal number"
-msgstr "Dezimalzahl"
-
-6
+8
-msgid "Boolean (Either True, False or None)"
-msgstr "Wahrheitswert (Wahr, Falsch oder Nichts)"
-
-
+
+
+
+
+
-msgid "Phone number"
-msgstr "Telefonnummer"
-
-0
+3
-msgid "String (up to 50)"
-msgstr "Zeichenkette (bis zu 50 Zeichen)"
-
-2
+5
-msgid "Text"
-msgstr "Text"
-
-3
+6
-msgid "Time"
-msgstr "Zeit"
-
-4
+7
-msgid "URL"
-msgstr "URL"
-
-5
+8
-msgid "U.S. state (two uppercase letters)"
-msgstr "U.S. Bundesstaat (zwei Grossbuchstaben)"
-
-6
+9
-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 �ern"
+
+#: 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
-4
+5
-#: contrib/admin/templates/admin/base.html:29
-0
+1
-#: contrib/admin/templates/registration/password_change_done.html:4
-#: contrib/admin/templates/registration/password_reset_form.html:4
@@ -581 +621 @@
-
-#: contrib/admin/templates/admin/object_history.html:5
-7
+8
-msgid "History"
-msgstr "Geschichte"
@@ -649 +689 @@
-
-#: contrib/admin/templates/admin/index.html:27
-2
+3
-msgid "Add"
-msgstr "Zuf�
@@ -672 +712 @@
-msgstr "Keine vorhanden"
-
-9
+10
-#, python-format
-msgid "Add %(name)s"
@@ -692 +732 @@
-msgstr "Willkommen,"
-
-
-
-
-
-
-
-
-
-
+
-#, python-format
-msgid ""
@@ -711 +743 @@
-"folgenden abh�igen Daten zu l�en:"
-
-4
+3
-#, python-format
-msgid ""
@@ -720 +752 @@
-"werden zus�lich die folgenden abh�igen Daten mit gel�t:"
-
-8
+7
-msgid "Yes, I'm sure"
-msgstr "Ja, ich bin sicher"
@@ -733 +765 @@
-msgstr "Los"
-
-8
+9
-msgid "View on site"
-msgstr "Im Web Anzeigen"
-
-6
+7
-msgid "Please correct the error below."
-msgid_plural "Please correct the errors below."
@@ -743 +775 @@
-msgstr[1] "Bitte die Fehler korrigieren."
-
-3
+4
-msgid "Ordering"
-msgstr "Sortierung"
-
-6
+7
-msgid "Order:"
-msgstr "Reihenfolge:"
@@ -961 +993 @@
-"Wie zuvor, aber �ent 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"
@@ -1040 +1080 @@
-msgstr "Webseiten"
-
-35
+50
-msgid "DATE_FORMAT"
-msgstr "j. N Y"
-
-36
+51
-msgid "DATETIME_FORMAT"
-msgstr "j. N Y, H:i"
-
-37
+52
-msgid "TIME_FORMAT"
-msgstr "H:i"
@@ -1768 +1808 @@
-msgid "yes,no,maybe"
-msgstr "Ja,Nein,Vielleicht"
-

django/trunk/django/contrib/admin/media/js/admin/DateTimeShortcuts.js

@@ -44 +44 @@
-        var now_link = document.createElement('a');
-        now_link.setAttribute('href', "javascript:DateTimeShortcuts.handleClockQuicklink(" + num + ", new Date().getHourMinute());");
-'Now'
+gettext('Now')
-        var clock_link = document.createElement('a');
-        clock_link.setAttribute('href', 'javascript:DateTimeShortcuts.openClock(' + num + ');');
-'Clock'
+gettext('Clock')
-        shortcuts_span.appendChild(document.createTextNode('\240'));
-        shortcuts_span.appendChild(now_link);
@@ -77 +77 @@
-        addEvent(clock_box, 'click', DateTimeShortcuts.cancelEventPropagation);
-
-'Choose a time'
+gettext('Choose a time')
-        time_list = quickElement('ul', clock_box, '');
-        time_list.className = 'timelist';
-"Now"
-"Midnight"
-"6 a.m."
-"Noon"
+gettext("Now")
+gettext("Midnight")
+gettext("6 a.m.")
+gettext("Noon")
-
-        cancel_p = quickElement('p', clock_box, '');
-        cancel_p.className = 'calendar-cancel';
-'Cancel'
+gettext('Cancel')
-    },
-    openClock: function(num) {
@@ -112 +112 @@
-        var today_link = document.createElement('a');
-        today_link.setAttribute('href', 'javascript:DateTimeShortcuts.handleCalendarQuickLink(' + num + ', 0);');
-'Today'
+gettext('Today')
-        var cal_link = document.createElement('a');
-        cal_link.setAttribute('href', 'javascript:DateTimeShortcuts.openCalendar(' + num + ');');
-'Calendar'
+gettext('Calendar')
-        shortcuts_span.appendChild(document.createTextNode('\240'));
-        shortcuts_span.appendChild(today_link);
@@ -165 +165 @@
-        var shortcuts = quickElement('div', cal_box, '');
-        shortcuts.className = 'calendar-shortcuts';
-'Yesterday'
+gettext('Yesterday')
-        shortcuts.appendChild(document.createTextNode('\240|\240'));
-'Today'
+gettext('Today')
-        shortcuts.appendChild(document.createTextNode('\240|\240'));
-'Tomorrow'
+gettext('Tomorrow')
-
-        // cancel bar
-        var cancel_p = quickElement('p', cal_box, '');
-        cancel_p.className = 'calendar-cancel';
-'Cancel'
+gettext('Cancel')
-    },
-    openCalendar: function(num) {

django/trunk/django/contrib/admin/templates/admin/change_form.html

@@ -2 +2 @@
-{% load i18n admin_modify adminmedia %}
-{% block extrahead %}
+<script type="text/javascript" src="../../../jsi18n/"></script>
-{% for js in bound_manipulator.javascript_imports %}{% include_admin_script js %}{% endfor %}
-{% endblock %}

django/trunk/django/contrib/admin/templates/widget/date_time.html

@@ +1 @@
+{% load i18n %}
-<p class="datetime"> 
-Date:
-Time:
+{% trans "Date:" %}
+{% trans "Time:" %}
-</p>

django/trunk/django/contrib/admin/urls/admin.py

@@ -4 +4 @@
-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'),