Ticket #12104: blocktrans_display_error.diff

django/templatetags/i18n.py

@@ -1 +1 @@
 import re
 
-from django.template import Node, Variable, VariableNode, _render_value_in_context
+from django.template import Node, Variable, VariableDoesNotExist, VariableNode, _render_value_in_context
 from django.template import TemplateSyntaxError, TokenParser, Library
 from django.template import TOKEN_TEXT, TOKEN_VAR
 from django.utils import translation
@@ -82 +82 @@
             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 = []
+        for v in vars:
+            if not context.has_key(v):
+                try:
+                    Variable(v).resolve(context)
+                except VariableDoesNotExist:
+                    # This is what should happen
+                    pass
+                else:
+                    raise TemplateSyntaxError, ("'blocktrans' doesn't allow "
+                        "variable.attribute lookup.  "
+                        "Use {% blocktrans variable.attr as foo .. %} instead")
+            data.append((v, _render_value_in_context(context[v], context)))
+        data = dict(data)
         context.pop()
         return result % data