Changeset 726

Timestamp:

09/29/05 12:01:05 (3 years ago)

Author:

hugo

Message:

i18n patch - references #65

Files:

• django/branches/i18n/django/bin/compile-messages.py (added)
• django/branches/i18n/django/bin/make-messages.py (added)
• django/branches/i18n/django/conf/admin_templates/index.html (modified) (3 diffs)
• django/branches/i18n/django/conf/locale (added)
• django/branches/i18n/django/conf/locale/de (added)
• django/branches/i18n/django/conf/locale/de/LC_MESSAGES (added)
• django/branches/i18n/django/conf/locale/de/LC_MESSAGES/django.mo (added)
• django/branches/i18n/django/conf/locale/de/LC_MESSAGES/django.po (added)
• django/branches/i18n/django/conf/settings.py (modified) (1 diff)
• django/branches/i18n/django/core/defaulttags.py (modified) (4 diffs)
• django/branches/i18n/django/core/validators.py (modified) (1 diff)
• django/branches/i18n/django/middleware/locale.py (added)
• django/branches/i18n/django/utils/translation.py (added)
• django/branches/i18n/setup.py (modified) (1 diff)

django/branches/i18n/django/conf/admin_templates/index.html

@@ -24 +24 @@
-
-            {% if model.perms.add %}
-Add
+{% i18n _('Add') %}
-            {% else %}
-                <td class="x50">&nbsp;</td>
@@ -30 +30 @@
-
-            {% if model.perms.change %}
-Change
+{% i18n _('Change') %}
-            {% else %}
-                <td class="x75">&nbsp;</td>
@@ -48 +48 @@
-<div id="content-related">
-    <div class="module" id="recent-actions-module">
-Recent Actions
-My Actions
+{% i18n _('Recent Actions') %}
+{% i18n _('My Actions') %}
-            {% load auth.log %}
-            {% get_admin_log 10 as admin_log for_user user %}
-            {% if not admin_log %}
-None available
+{% i18n _('None available') %}
-            {% else %}
-            <ul class="actionlist">

django/branches/i18n/django/conf/settings.py

@@ -56 +56 @@
-        delattr(me, k)
-del me, k
+
+# as the last step, install the translation machinery and
+# remove the module again to not clutter the namespace.
+from django.utils import translation
+translation.install()
+del translation
+

django/branches/i18n/django/core/defaulttags.py

@@ -1 +1 @@
-"Default tags used by the template system, available to all templates."
-
+import re
-import sys
-import template
+
+from django.utils import translation
-
-class CommentNode(template.Node):
@@ -284 +287 @@
-        return str(int(round(ratio)))
-
+class I18NNode(template.Node):
+
+    def __init__(self, cmd):
+        self.cmd = cmd
+        self.i18n_re = re.compile(r'^\s*_\((.*)\)\s*$')
+
+    def render(self, context):
+        m = self.i18n_re.match(self.cmd)
+        if m:
+            s = m.group(1)
+            if s.startswith("'") and s.endswith("'"):
+                s = s[1:-1]
+            elif s.startswith('"""') and s.endswith('"""'):
+                s = s[3:-3]
+            elif s.startswith('"') and s.endswith('"'):
+                s = s[1:-1]
+            else:
+                raise template.TemplateSyntaxError("i18n must be called as {% i18n _('some message') %}")
+            return translation.gettext(s) % context
+        else:
+            raise template.TemplateSyntaxError("i18n must be called as {% i18n _('some message') %}")
+
-def do_comment(parser, token):
-    """
@@ -746 +771 @@
-    return WidthRatioNode(this_value_var, max_value_var, max_width)
-
+def do_i18n(parser, token):
+    """
+    translate a given string with the current
+    translation object.
+
+    For example::
+
+        {% i18n _('test') %}
+
+    """
+    args = token.contents.split(' ', 1)
+    if len(args) != 2:
+        raise template.TemplateSyntaxError("'i18n' requires one argument (got %r)" % args)
+
+    return I18NNode(args[1].strip())
+
-template.register_tag('comment', do_comment)
-template.register_tag('cycle', do_cycle)
@@ -762 +803 @@
-template.register_tag('templatetag', do_templatetag)
-template.register_tag('widthratio', do_widthratio)
+template.register_tag('i18n', do_i18n)
+

django/branches/i18n/django/core/validators.py

@@ -54 +54 @@
-def isAlphaNumeric(field_data, all_data):
-    if not alnum_re.search(field_data):
-"This value must contain only letters, numbers and underscores."
+_("This value must contain only letters, numbers and underscores.")
-
-def isAlphaNumericURL(field_data, all_data):

django/branches/i18n/setup.py

@@ -18 +18 @@
-                        'admin_media/css/*.css', 'admin_media/img/admin/*.gif',
-                        'admin_media/img/admin/*.png', 'admin_media/js/*.js',
-
+, 'locale/*/*/*.mo'
-    },
-    scripts = ['django/bin/django-admin.py'],