Changeset 1061

Timestamp:

11/03/05 05:25:18 (3 years ago)

Author:

hugo

Message:

i18n: implemented the proposed syntax change to {% trans %} and {% blocktrans %}

Files:

• django/branches/i18n/django/bin/make-messages.py (modified) (2 diffs)
• django/branches/i18n/django/conf/locale/de/LC_MESSAGES/django.mo (modified) (previous)
• django/branches/i18n/django/conf/locale/de/LC_MESSAGES/django.po (modified) (10 diffs)
• django/branches/i18n/django/contrib/admin/templates/admin/404.html (modified) (1 diff)
• django/branches/i18n/django/contrib/admin/templates/admin/500.html (modified) (1 diff)
• django/branches/i18n/django/contrib/admin/templates/admin/base.html (modified) (3 diffs)
• django/branches/i18n/django/contrib/admin/templates/admin/base_site.html (modified) (1 diff)
• django/branches/i18n/django/contrib/admin/templates/admin/delete_confirmation.html (modified) (2 diffs)
• django/branches/i18n/django/contrib/admin/templates/admin/index.html (modified) (5 diffs)
• django/branches/i18n/django/contrib/admin/templates/admin/login.html (modified) (2 diffs)
• django/branches/i18n/django/contrib/admin/templates/admin/object_history.html (modified) (3 diffs)
• django/branches/i18n/django/contrib/admin/templates/registration/logged_out.html (modified) (1 diff)
• django/branches/i18n/django/contrib/admin/templates/registration/password_change_done.html (modified) (1 diff)
• django/branches/i18n/django/contrib/admin/templates/registration/password_change_form.html (modified) (1 diff)
• django/branches/i18n/django/contrib/admin/templates/registration/password_reset_done.html (modified) (1 diff)
• django/branches/i18n/django/contrib/admin/templates/registration/password_reset_email.html (modified) (1 diff)
• django/branches/i18n/django/contrib/admin/templates/registration/password_reset_form.html (modified) (1 diff)
• django/branches/i18n/django/core/template/__init__.py (modified) (6 diffs)
• django/branches/i18n/django/templatetags/i18n.py (added)
• django/branches/i18n/django/utils/translation.py (modified) (2 diffs)

django/branches/i18n/django/bin/make-messages.py

@@ -5 +5 @@
-import sys
-import getopt
+
+from django.utils.translation import templateize
-
-localedir = None
@@ -44 +46 @@
-elif all:
-    languages = [el for el in os.listdir(localedir) if not el.startswith('.')]
-
-dot_re = re.compile('\S')
-def blank(src):
-    return dot_re.sub('p', src)
-
-def templateize(src):
-    o = []
-    going = 1
-    while going:
-        start = src.find('{')
-        if start >= 0 and src[start+1] in ('{', '%'):
-            o.append(blank(src[:start]))
-            end = src.find(src[start+1] == '{' and '}}' or '%}', start)
-            if end >= 0:
-                o.append(src[start:end+2])
-                src = src[end+2:]
-            else:
-                o.append(blank(src[start:]))
-                going = 0
-        else:
-            o.append(blank(src))
-            going = 0
-    return ''.join(o)
-
-for lang in languages:

django/branches/i18n/django/conf/locale/de/LC_MESSAGES/django.po

@@ -8 +8 @@
-"Project-Id-Version: Django 1.0\n"
-"Report-Msgid-Bugs-To: \n"
-0-24 00:03+02
+1-03 12:21+01
-"PO-Revision-Date: 2005-10-08 00:03+0200\n"
-"Last-Translator: Georg Bauer <gb@bofh.ms>\n"
@@ -15 +15 @@
-"Content-Transfer-Encoding: 8bit\n"
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-msgid "Home"
-msgstr "Start"
-
-4
+5
-msgid "History"
-msgstr "Geschichte"
-
-7
+8
-msgid "Date/time"
-msgstr "Datum/Zeit"
-
-8
+9
-msgid "User"
-msgstr "Benutzer"
-
-19
+20
-msgid "Action"
-msgstr "Aktion"
-
-5
+6
-msgid "DATE_WITH_TIME_FULL"
-msgstr "j. N Y, H:i"
-
-5
+6
-msgid ""
-"This object doesn't have a change history. It probably wasn't added via this "
@@ -53 +54 @@
-"�iese Verwaltungsseiten angelegt."
-
-3
+4
-msgid "Django site admin"
-msgstr "Django Systemverwaltung"
-
-6
+7
-msgid "Django administration"
-msgstr "Django Verwaltung"
-
-
+
+
+
+
+
-msgid "Server error (500)"
-msgstr "Serverfehler (500)"
-
-8
+9
-msgid "Server Error <em>(500)</em>"
-msgstr "Serverfehler <em>(500)</em>"
-
-9
+10
-msgid ""
-"There's been an error. It's been reported to the site administrators via e-"
@@ -78 +83 @@
-"Verst�nis."
-
-3
-7
+4
+8
-msgid "Page not found"
-msgstr "Seite nicht gefunden"
-
-9
+10
-msgid "We're sorry, but the requested page could not be found."
-msgstr ""
-"Es tut uns leid, aber die angeforderte Seite kann nicht gefunden werden."
-
-6
+7
-msgid "Add"
-msgstr "Zuf�
-2
+3
-msgid "Change"
-msgstr "�dern"
-
-2
+3
-msgid "You don't have permission to edit anything."
-msgstr "Sie haben keine Berechtigung irgendwas zu �ern."
-
-0
+1
-msgid "Recent Actions"
-msgstr "K�he Aktionen"
-
-1
+2
-msgid "My Actions"
-msgstr "Meine Aktionen"
-
-5
+6
-msgid "None available"
-msgstr "Keine vorhanden"
-
-4
+5
-msgid "Username:"
-msgstr "Benutzername:"
-
-7
+8
-msgid "Password:"
-msgstr "Passwort:"
-
-19
+20
-msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
-msgstr "Haben Sie <a href=\"/password_reset/\">ihr Passwort vergessen</a>?"
-
-3
+4
-msgid "Log in"
-msgstr "Anmelden"
-
-2
+3
-msgid "Welcome,"
-msgstr "Willkommen,"
-
-2
+3
-msgid "Change password"
-msgstr "Passwort �ern"
-
-2
+3
-msgid "Log out"
-msgstr "Abmelden"
-
-6
-
-
- 
+7
+
+
+
-"objects, but your account doesn't have permission to delete the following "
-"types of objects:"
@@ -150 +155 @@
-"folgenden abh�igen Daten zu l�en:"
-
-3
+4
-#, python-format
-msgid ""
@@ -159 +164 @@
-"werden zus�lich die folgenden abh�igen Daten mit gel�t:"
-
-7
+8
-msgid "Yes, I'm sure"
-msgstr "Ja, ich bin sicher"
-
-3
-3
-5
-9
+4
+4
+6
+10
-msgid "Password change"
-msgstr "Kennwort �ern"
-
-5
-9
+6
+10
-msgid "Password change successful"
-msgstr "Erfolgreiche Kennwort�erung"
-
-1
+2
-msgid "Your password was changed."
-msgstr "Ihr Kennwort wurde ge�ert."
-
-
-
-
-
+
+
+
-msgid "Password reset"
-msgstr "Kennwort zur�zen"
-
-1
+2
-msgid ""
-"Forgotten your password? Enter your e-mail address below, and we'll reset "
@@ -195 +199 @@
-"Sie raus."
-
-5
+6
-msgid "E-mail address:"
-msgstr "eMail-Adresse:"
-
-5
+6
-msgid "Reset my password"
-msgstr "Mein Kennwort zur�zen"
-
-7
+8
-msgid "Thanks for spending some quality time with the Web site today."
-msgstr "Danke, dass Sie eine Weile bei uns waren."
-
-9
+10
-msgid "Log in again"
-msgstr "Neu anmelden"
-
-5
-9
+6
+10
-msgid "Password reset successful"
-msgstr "Erfolgreich Kennwort zur�etzt"
-
-1
+2
-msgid ""
-"We've e-mailed a new password to the e-mail address you submitted. You "
@@ -224 +228 @@
-"Sie uns gegeben haben. Es sollte in K�nkommen."
-
-1
+2
-msgid ""
-"Please enter your old password, for security's sake, and then enter your new "
@@ -233 +237 @@
-"neue Kennwort ein."
-
-6
+7
-msgid "Old password:"
-msgstr "altes Kennwort:"
-
-8
+9
-msgid "New password:"
-msgstr "neues Kennwort:"
-
-0
+1
-msgid "Confirm password:"
-msgstr "Kennwortwiederholung:"
-
-2
+3
-msgid "Change my password"
-msgstr "Mein Kennwort �ern"
-
-1
+2
-msgid "You're receiving this e-mail because you requested a password reset"
-msgstr "Sie erhalten diese Mail, weil Sie ein neues Kennwort"
-
-2
+3
-#, python-format
-msgid "for your user account at %(site_name)s"
-msgstr "f�en Benutzer bei %(site_name)s angefordert haben."
-
-4
+5
-#, python-format
-msgid "Your new password is: %(new_password)s"
-msgstr "Ihr neues Kennwort ist: %(new_password)s"
-
-6
+7
-msgid "Feel free to change this password by going to this page:"
-msgstr "Sie k�n das Kennwort auf folgender Seite �ern:"
-
-0
+1
-msgid "Your username, in case you've forgotten:"
-msgstr "Ihr Benutzername, falls Sie ihn vergessen haben:"
-
-2
+3
-msgid "Thanks for using our site!"
-msgstr "Vielen Dank, das Sie unsere Seiten benutzen!"
-
-4
+5
-#, python-format
-msgid "The %(site_name)s team"
@@ -653 +657 @@
-
-#: conf/global_settings.py:37
+msgid "Czech"
+msgstr "Tschechisch"
+
+#: conf/global_settings.py:38
-msgid "German"
-msgstr "Deutsch"
-
-8
+9
-msgid "English"
-msgstr "Englisch"
-
-39
+40
-msgid "Spanish"
-msgstr "Spanisch"
-
-0
+1
-msgid "French"
-msgstr "Franz�ch"
-
-1
+2
-msgid "Galician"
-msgstr "Galicisch"
-
-2
+3
-msgid "Italian"
-msgstr "Italienisch"
-
-3
+4
-msgid "Brazilian"
-msgstr "Brasilianisch"
-
-4
+5
-msgid "Russian"
-msgstr "Russisch"
-
-5
-c
+6
+an
-msgstr "Serbisch"
-
-6
-Czech
-Tschechisch
+7
+Traditional Chinese
+
-
-#: core/validators.py:58

django/branches/i18n/django/contrib/admin/templates/admin/404.html

@@ -1 +1 @@
-{% extends "admin/base_site" %}
+{% load i18n %}
-
-{ _('Page not found') }
+% trans 'Page not found' %
-
-{% block content %}
-
-{ _('Page not found') }
+% trans 'Page not found' %
-
-{ _("We're sorry, but the requested page could not be found.") }
+% trans "We're sorry, but the requested page could not be found." %
-
-{% endblock %}

django/branches/i18n/django/contrib/admin/templates/admin/500.html

@@ -1 +1 @@
-{% extends "admin/base_site" %}
+{% load i18n %}
-
-Home</a> &rsaquo; Server error
+{% trans "Home" %}</a> &rsaquo; {% trans "Server error" %}
-
-{ _('Server error (500)') }
+% trans 'Server error (500)' %
-
-{% block content %}
-{ _('Server Error <em>(500)</em>') }
-{ _("There's been an error. It's been reported to the site administrators via e-mail and should be fixed shortly. Thanks for your patience.") }
+% trans 'Server Error <em>(500)</em>' %
+% trans "There's been an error. It's been reported to the site administrators via e-mail and should be fixed shortly. Thanks for your patience." %
-
-{% endblock %}

django/branches/i18n/django/contrib/admin/templates/admin/base.html

@@ -7 +7 @@
-{% block extrahead %}{% endblock %}
-</head>
+{% load i18n %}
-
-<body class="{% if is_popup %}popup {% endif %}{% block bodyclass %}{% endblock %}">
@@ -20 +21 @@
-        </div>
-        {% if not user.is_anonymous %}
-{ _('Welcome,') }} <strong>{% if user.first_name %}{{ user.first_name }}{% else %}{{ user.username }}{% endif %}</strong>. <br />{% block userlinks %}<a href="/admin/password_change/">{{ _('Change password') }}</a> / <a href="/admin/logout/">{{ _('Log out') }
+% trans 'Welcome,' %} <strong>{% if user.first_name %}{{ user.first_name }}{% else %}{{ user.username }}{% endif %}</strong>. <br />{% block userlinks %}<a href="/admin/password_change/">{% trans 'Change password' %}</a> / <a href="/admin/logout/">{% trans 'Log out' %
-        {% endif %}
-        {% block nav-global %}{% endblock %}
@@ -26 +27 @@
-    </div>
-    <!-- END Header -->
-{ _('Home') }
+% trans 'Home' %
-    {% endif %}
-

django/branches/i18n/django/contrib/admin/templates/admin/base_site.html

@@ -1 +1 @@
-{% extends "admin/base" %}
+{% load i18n %}
-
-{ _('Django site admin') }
+% trans 'Django site admin' %
-
-{% block branding %}
-{ _('Django administration') }
+% trans 'Django administration' %
-<h2 id="site-url"><a href="http://www.example.com/">example.com</a></h2>
-{% endblock %}

django/branches/i18n/django/contrib/admin/templates/admin/delete_confirmation.html

@@ -1 +1 @@
-{% extends "admin/base_site" %}
+{% load i18n %}
-
-{% block content %}
-
-{% if perms_lacking %}
-{ _("Deleting the %(object_name)s  '%(object)s' would result in deleting related objects, but your account doesn't have permission to delete the following types of objects:") }
+% blocktrans %}Deleting the {{ object_name }} '{{ object }}' would result in deleting related objects, but your account doesn't have permission to delete the following types of objects:{% endblocktrans %
-    <ul>
-    {% for obj in perms_lacking %}
@@ -11 +12 @@
-    </ul>
-{% else %}
-{ _('Are you sure you want to delete the %(object_name)s "%(object)s"? All of the following related items will be deleted:') }
+% blocktrans %}Are you sure you want to delete the {{ object_name }} "{{ object }}"? All of the following related items will be deleted:{% endblocktrans %
-    <ul>{{ deleted_objects|unordered_list }}</ul>
-    <form action="" method="post">
-    <input type="hidden" name="post" value="yes" />
-{ _("Yes, I'm sure") }
+% trans "Yes, I'm sure" %
-    </form>
-{% endif %}

django/branches/i18n/django/contrib/admin/templates/admin/index.html

@@ -1 +1 @@
-{% extends "admin/base_site" %}
+{% load i18n %}
-
-{% block coltype %}colMS{% endblock %}
@@ -24 +25 @@
-
-            {% if model.perms.add %}
-{ _('Add') }
+% trans 'Add' %
-            {% else %}
-                <td class="x50">&nbsp;</td>
@@ -30 +31 @@
-
-            {% if model.perms.change %}
-{ _('Change') }
+% trans 'Change' %
-            {% else %}
-                <td class="x75">&nbsp;</td>
@@ -40 +41 @@
-    {% endfor %}
-{% else %}
-{ _("You don't have permission to edit anything.") }
+% trans "You don't have permission to edit anything." %
-{% endif %}
-</div>
@@ -48 +49 @@
-<div id="content-related">
-    <div class="module" id="recent-actions-module">
-{ _('Recent Actions') }
-{ _('My Actions') }
+% trans 'Recent Actions' %
+% trans 'My Actions' %
-            {% load log %}
-            {% get_admin_log 10 as admin_log for_user user %}
-            {% if not admin_log %}
-{ _('None available') }
+% trans 'None available' %
-            {% else %}
-            <ul class="actionlist">

django/branches/i18n/django/contrib/admin/templates/admin/login.html

@@ -1 +1 @@
-{% extends "admin/base_site" %}
+{% load i18n %}
-
-{% block breadcrumbs %}{% endblock %}
@@ -12 +13 @@
-
-<p class="aligned">
-{ _('Username:') }
+% trans 'Username:' %
-</p>
-<p class="aligned">
-{ _('Password:') }
+% trans 'Password:' %
-<input type="hidden" name="this_is_the_login_form" value="1" />
-{ _('Have you <a href="/password_reset/">forgotten your password</a>?') }
+% trans 'Have you <a href="/password_reset/">forgotten your password</a>?' %
-</p>
-
-<div class="aligned ">
-{ _('Log in') }
+% trans 'Log in' %
-</div>
-</form>

django/branches/i18n/django/contrib/admin/templates/admin/object_history.html

@@ -1 +1 @@
-{% extends "admin/base_site" %}
+{% load i18n %}
-
-{% block breadcrumbs %}
-{ _('Home') }}</a> &rsaquo; <a href="../../">{{ module_name }}</a> &rsaquo; <a href="../">{{ object|truncatewords:"18" }}</a> &rsaquo; {{ _('History') }
+% trans 'Home' %}</a> &rsaquo; <a href="../../">{{ module_name }}</a> &rsaquo; <a href="../">{{ object|truncatewords:"18" }}</a> &rsaquo; {% trans 'History' %
-{% endblock %}
-
@@ -15 +16 @@
-        <thead>
-        <tr>
-{ _('Date/time') }
-{ _('User') }
-{ _('Action') }
+% trans 'Date/time' %
+% trans 'User' %
+% trans 'Action' %
-        </tr>
-        </thead>
@@ -33 +34 @@
-{% else %}
-
-{ _("This object doesn't have a change history. It probably wasn't added via this admin site.") }
+% trans "This object doesn't have a change history. It probably wasn't added via this admin site." %
-
-{% endif %}

django/branches/i18n/django/contrib/admin/templates/registration/logged_out.html

@@ -1 +1 @@
-{% extends "admin/base_site" %}
+{% load i18n %}
-
-{ _('Home') }
+% trans 'Home' %
-
-{% block content %}
-
-{ _("Thanks for spending some quality time with the Web site today.") }
+% trans "Thanks for spending some quality time with the Web site today." %
-
-{ _('Log in again') }
+% trans 'Log in again' %
-
-{% endblock %}

django/branches/i18n/django/contrib/admin/templates/registration/password_change_done.html

@@ -1 +1 @@
-{% extends "admin/base_site" %}
+{% load i18n %}
-
-{ _('Home') }}</a> &rsaquo; {{ _('Password change') }
+% trans 'Home' %}</a> &rsaquo; {% trans 'Password change' %
-
-{ _('Password change successful') }
+% trans 'Password change successful' %
-
-{% block content %}
-
-{ _('Password change successful') }
+% trans 'Password change successful' %
-
-{ _('Your password was changed.') }
+% trans 'Your password was changed.' %
-
-{% endblock %}

django/branches/i18n/django/contrib/admin/templates/registration/password_change_form.html

@@ -1 +1 @@
-{% extends "admin/base_site" %}
+{% load i18n %}
-
-{ _('Home') }}</a> &rsaquo; {{ _('Password change') }
+% trans 'Home' %}</a> &rsaquo; {% trans 'Password change' %
-
-{ _('Password change') }
+% trans 'Password change' %
-
-{% block content %}
-
-{ _('Password change') }
+% trans 'Password change' %
-
-{ _("Please enter your old password, for security's sake, and then enter your new password twice so we can verify you typed it in correctly.") }
+% trans "Please enter your old password, for security's sake, and then enter your new password twice so we can verify you typed it in correctly." %
-
-<form action="" method="post">
-
-{% if form.old_password.errors %}{{ form.old_password.html_error_list }}{% endif %}
-{ _('Old password:') }
+% trans 'Old password:' %
-{% if form.new_password1.errors %}{{ form.new_password1.html_error_list }}{% endif %}
-{ _('New password:') }
+% trans 'New password:' %
-{% if form.new_password2.errors %}{{ form.new_password2.html_error_list }}{% endif %}
-{ _('Confirm password:') }
+% trans 'Confirm password:' %
-
-{ _('Change my password') }
+% trans 'Change my password' %
-</form>
-

django/branches/i18n/django/contrib/admin/templates/registration/password_reset_done.html

@@ -1 +1 @@
-{% extends "admin/base_site" %}
+{% load i18n %}
-
-{ _('Home') }}</a> &rsaquo; {{ _('Password reset') }
+% trans 'Home' %}</a> &rsaquo; {% trans 'Password reset' %
-
-{ _('Password reset successful') }
+% trans 'Password reset successful' %
-
-{% block content %}
-
-{ _('Password reset successful') }
+% trans 'Password reset successful' %
-
-{ _("We've e-mailed a new password to the e-mail address you submitted. You should be receiving it shortly.") }
+% trans "We've e-mailed a new password to the e-mail address you submitted. You should be receiving it shortly." %
-
-{% endblock %}

django/branches/i18n/django/contrib/admin/templates/registration/password_reset_email.html

@@ -1 @@
-
-
+
+
+
-
-{ _("Your new password is: %(new_password)s") }
+% trans "Your new password is: %(new_password)s" %
-
-{ _("Feel free to change this password by going to this page:") }
+% trans "Feel free to change this password by going to this page:" %
-
-http://{{ domain }}/password_change/
-
-{ _("Your username, in case you've forgotten:") }
+% trans "Your username, in case you've forgotten:" %
-
-{ _("Thanks for using our site!") }
+% trans "Thanks for using our site!" %
-
-{ _("The %(site_name)s team") }
+% trans "The %(site_name)s team" %

django/branches/i18n/django/contrib/admin/templates/registration/password_reset_form.html

@@ -1 +1 @@
-{% extends "admin/base_site" %}
+{% load i18n %}
-
-{ _('Home') }}</a> &rsaquo; {{ _('Password reset') }
+% trans 'Home' %}</a> &rsaquo; {% trans 'Password reset' %
-
-{ _("Password reset") }
+% trans "Password reset" %
-
-{% block content %}
-
-{ _(
+% trans 
-
-{ _("Forgotten your password? Enter your e-mail address below, and we'll reset your password and e-mail the new one to you.") }
+% trans "Forgotten your password? Enter your e-mail address below, and we'll reset your password and e-mail the new one to you." %
-
-<form action="" method="post">
-{% if form.email.errors %}{{ form.email.html_error_list }}{% endif %}
-{ _('E-mail address:') }}</label> {{ form.email }} <input type="submit" value="{{ _('Reset my password') }
+% trans 'E-mail address:' %}</label> {{ form.email }} <input type="submit" value="{% trans 'Reset my password' %
-</form>
-

django/branches/i18n/django/core/template/__init__.py

@@ -235 +235 @@
-        del self.tokens[0]
-
+class TokenParser:
+    """
+    You need to subclass this class and implement the
+    top method to parse your template line. When instantiating
+    the parser, you pass in the line from the django template
+    parser.
+
+    If your tag needs to know what tag name it was called with,
+    you find it in the tagname instance variable of the parser.
+    """
+
+    def __init__(self, subject):
+        self.subject = subject
+        self.pointer = 0
+        self.backout = []
+        self.tagname = self.tag()
+
+    def top(self):
+        """
+        You need to overload this method to do the actual parsing
+        and return the result.
+        """
+        raise NotImplemented
+
+    def more(self):
+        """
+        This returns True if there is more stuff in the tag.
+        """
+        return self.pointer < len(self.subject)
+