Changeset 6679

Timestamp:

11/16/07 22:04:12 (1 year ago)

Author:

mtredinnick

Message:

Fixed #4713 -- Fixed handling of _() in template tag arguments. Based on
patched from Indy and SmileyChris?.

Files:

• django/trunk/django/template/__init__.py (modified) (3 diffs)
• django/trunk/tests/regressiontests/templates/tests.py (modified) (1 diff)

django/trunk/django/template/__init__.py

@@ -679 +679 @@
-        self.literal = None
-        self.lookups = None
+        self.translate = False
-
-        try:
@@ -699 +700 @@
-        except ValueError:
-            # A ValueError means that the variable isn't a number.
+            if var.startswith('_(') and var.endswith(')'):
+                # The result of the lookup should be translated at rendering
+                # time.
+                self.translate = True
+                var = var[2:-1]
-            # If it's wrapped with quotes (single or double), then
-            # we're also dealing with a literal.
-            if var[0] in "\"'" and var[0] == var[-1]:
-                self.literal = var[1:-1]
-
-            else:
-                # Otherwise we'll set self.lookups so that resolve() knows we're
@@ -713 +718 @@
-        if self.lookups is not None:
-            # We're dealing with a variable that needs to be resolved
-return
+value =
-        else:
-            # We're dealing with a literal, so it's already been "resolved"
-
+
+
+
+
-
-    def __repr__(self):

django/trunk/tests/regressiontests/templates/tests.py

@@ -735 +735 @@
-            'i18n12': ('{% load i18n %}{% get_available_languages as langs %}{% for lang in langs %}{% ifequal lang.0 "de" %}{{ lang.0 }}{% endifequal %}{% endfor %}', {}, 'de'),
-
-a constant string
+constant strings
-            'i18n13': ('{{ _("Page not found") }}', {'LANGUAGE_CODE': 'de'}, 'Seite nicht gefunden'),
+            'i18n14': ('{% cycle "foo" _("Password") _(\'Password\') as c %} {% cycle c %} {% cycle c %}', {'LANGUAGE_CODE': 'de'}, 'foo Passwort Passwort'),
+            'i18n15': ('{{ absent|default:_("Password") }}', {'LANGUAGE_CODE': 'de', 'absent': ""}, 'Passwort'),
-
-            ### HANDLING OF TEMPLATE_STRING_IF_INVALID ###################################