Changeset 1065

Timestamp:

11/03/05 10:50:41 (3 years ago)

Author:

hugo

Message:

i18n: readded constant string translations, needed for template tags with string constants

Files:

• django/branches/i18n/django/core/template/__init__.py (modified) (3 diffs)
• django/branches/i18n/tests/othertests/templates.py (modified) (1 diff)

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

@@ -349 +349 @@
-        # First read the variable part - decide on wether we need
-        # to parse a string or a variable by peeking into the stream
-
+_', '
-            self.var = self.read_constant_string_token()
-        else:
@@ -383 +383 @@
-        val = ''
-        qchar = None
+        i18n = False
-        self.next_char()
+        if self.current == '_':
+            i18n = True
+            self.next_char() 
+            if self.current != '(':
+                raise TemplateSyntaxError, "Bad character (expecting '(') '%s'" % self.current
+            self.next_char()
-        if not self.current in ('"', "'"):
-            raise TemplateSyntaxError, "Bad character (expecting '\"' or ''') '%s'" % self.current
@@ -395 +402 @@
-        val += self.current
-        self.next_char()
+        if i18n:
+            if self.current != ')':
+                raise TemplateSyntaxError, "Bad character (expecting ')') '%s'" % self.current
+            self.next_char()
+            val = qchar+_(val.strip(qchar))+qchar
-        return val
-

django/branches/i18n/tests/othertests/templates.py

@@ -253 +253 @@
-    # usage of the get_available_languages tag
-    'i18n12': ('{% load i18n %}{% get_available_languages as langs %}{% for lang in langs %}{% ifequal lang.0 "de" %}{{ lang.0 }}{% endifequal %}{% endfor %}', {}, 'de'),
+
+    # translation of a constant string
+    'i18n13': ('{{ _("Page not found") }}', {'LANGUAGE_CODE': 'de'}, 'Seite nicht gefunden'),
-}
-