Ticket #12104: django_svn_blocktrans_patch.diff

i18n.py

@@ -3 +3 @@
 from django.template import Node, Variable, VariableNode, _render_value_in_context
 from django.template import TemplateSyntaxError, TokenParser, Library
 from django.template import TOKEN_TEXT, TOKEN_VAR
+from django.template import Context, Template
 from django.utils import translation
 from django.utils.encoding import force_unicode
 
@@ -82 +83 @@
             result = translation.ugettext(singular)
         # Escape all isolated '%' before substituting in the context.
         result = re.sub(u'%(?!\()', u'%%', result)
-        data = dict([(v, _render_value_in_context(context[v], context)) for v in vars])
+        data = {}
+        c = Context(context)
+        for v in vars:
+            t = Template("{{%s}}" % v)
+            rendered_val = _render_value_in_context(t.render(c), context)
+            data[v] = rendered_val
         context.pop()
         return result % data