Ticket #5972: trans_understands_filter_alternate_version.4.diff

django/templatetags/i18n.py

@@ -34 +34 @@
         return ''
 
 class TranslateNode(Node):
-    def __init__(self, value, noop):
-        self.value = Variable(value)
+    def __init__(self, filter_expression, noop):
+        self.filter_expression = filter_expression
         self.noop = noop
 
     def render(self, context):
-        value = self.value.resolve(context)
-        if self.noop:
-            return value
-        else:
-            return translation.ugettext(value)
+        
+        if not self.noop:
+            translated = translation.ugettext(self.filter_expression.var.resolve(context))
+            self.filter_expression.var = Variable('"'+translated+'"')
+        # Filters are applied here
+        return self.filter_expression.resolve(context)
 
 class BlockTranslateNode(Node):
     def __init__(self, extra_context, singular, plural=None, countervar=None,
@@ -171 +174 @@
     class TranslateParser(TokenParser):
         def top(self):
             value = self.value()
+
+            # Backwards Compatiblity fix:
+            # FilterExpression does not support single-quoted strings,
+            # so we make a cheap localized fix in order to maintain
+            # backwards compatibility with existing uses of ``trans``
+            # where single quote use is supported.
+            if value[0] == "'":
+                pos = None
+                m = re.match("^'([^']+)'(\|.*$)",value)
+                if m:
+                    value = '"%s"%s' % (m.group(1).replace('"','\\"'),m.group(2))
+                elif value[-1] == "'":
+                    value = '"%s"' % value[1:-1].replace('"','\\"')
+                    
             if self.more():
                 if self.tag() == 'noop':
                     noop = True
@@ -180 +197 @@
                 noop = False
             return (value, noop)
     value, noop = TranslateParser(token.contents).top()
-    return TranslateNode(value, noop)
+    return TranslateNode(parser.compile_filter(value), noop)
 
 def do_block_translate(parser, token):
     """

django/template/__init__.py

@@ -547 +557 @@
             if var == None:
                 var, constant, i18n_constant = match.group("var", "constant", "i18n_constant")
                 if i18n_constant:
-                    var = '"%s"' %  _(i18n_constant)
+                    var = "'%s'" % _(i18n_constant.replace(r'\"', '"'))
                 elif constant:
-                    var = '"%s"' % constant
+                    var = "'%s'" % constant.replace(r'\"', '"')
                 upto = match.end()
                 if var == None:
                     raise TemplateSyntaxError, "Could not find variable at start of %s" % token