Ticket #4713: 4713.patch

django/template/__init__.py

@@ -642 +642 @@
     """
     return Variable(path).resolve(context)
 
+trans_re = re.compile(r'_\((.*)\)$')
+
 class Variable(object):
     """
     A template variable, resolvable against a given context. The variable may be
@@ -667 +669 @@
         self.var = var
         self.literal = None
         self.lookups = None
+        self.translate = False
         
         try:
             # First try to treat this variable as a number.
@@ -687 +690 @@
 
         except ValueError:
             # A ValueError means that the variable isn't a number.
+
+            # Check to see if we're dealing with a translatable var:
+            translate = trans_re.match(var)
+            if translate:
+                self.translate = True
+                var = translate.group(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]:
@@ -701 +711 @@
         """Resolve this variable against a given context."""
         if self.lookups is not None:
             # We're dealing with a variable that needs to be resolved
-            return self._resolve_lookup(context)
+            var = self._resolve_lookup(context)
         else:
             # We're dealing with a literal, so it's already been "resolved"
-            return self.literal
+            var = self.literal
+        if self.translate:
+            # We need to translate the variable
+            var = _(var)
+        return var
             
     def __repr__(self):
         return "<%s: %r>" % (self.__class__.__name__, self.var)