Changeset 761

Timestamp:

10/01/05 11:35:20 (3 years ago)

Author:

hugo

Message:

i18n: i18n string resolution now does string interpolation against the context, too

Files:

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

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

@@ -419 +419 @@
-        current = path[1:-1]
-    elif path.startswith('_(') and path.endswith(')') and path[2] in ("'", '"') and path[-2] == path[2]:
-
+ % context
-    else:
-        current = context

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

@@ -245 +245 @@
-    # translation of string without i18n tag
-    'i18n11': ('{{ _("blah") }}', {}, "blah"),
+
+    # translation of string without i18n tag but with interpolation
+    'i18n12': ('{{ _("blah%(anton)s") }}', {'anton': 'blubb'}, "blahblubb"),
-}
-