Ticket #3970: 118n-tags_3970.patch

templatetags/i18n.py

@@ -31 +31 @@
         return ''
 
 class TranslateNode(Node):
-    def __init__(self, value, noop):
-        self.value = value
-        self.noop = noop
+    def __init__(self, value, noop, as_var):
+        self.value  = value
+        self.noop   = noop
+        self.as_var = as_var
 
     def render(self, context):
         value = resolve_variable(self.value, context)
-        if self.noop:
+        if not self.noop:
+            value = translation.gettext(value)
+
+        if self.as_var != False:
+            context[self.as_var] = value
+            return ''
+        else:
             return value
-        else:
-            return translation.gettext(value)
 
+
 class BlockTranslateNode(Node):
     def __init__(self, extra_context, singular, plural=None, countervar=None, counter=None):
         self.extra_context = extra_context
@@ -158 +164 @@
     This will just try to translate the contents of
     the variable ``variable``. Make sure that the string
     in there is something that is in the .po file.
+
+    Additionally, one can use the 'as' keyword to specify
+    whether or not something should go into a context variable
+    instead. For example you can do::
+
+        {% trans "this is a string" as translated_text %}
+        {{ translated_text|truncatewords:4 }}
+
+    Or, if you wish to still use noop::
+    
+        {% trans "this is a string" as translated_text noop %}
+        {{ translated_text|truncatewords:4 }}
+        
     """
     class TranslateParser(TokenParser):
         def top(self):
             value = self.value()
             if self.more():
-                if self.tag() == 'noop':
-                    noop = True
+                next_tag = self.tag()
+
+                if next_tag.lower() not in ('noop','as'):
+                    raise TemplateSyntaxError, "Invalid parameters for 'trans'"
+                
+                if next_tag.lower() == 'as':
+                    # we're using the 'as' syntax
+                    if not self.more():
+                        raise TemplateSyntaxError, "Invalid parameters for 'trans'"
+                    as_var = self.tag()
+
+                    if self.more():
+                        if self.tag().lower() == 'noop':
+                            noop = True
+                        else:
+                            raise TemplateSyntaxError, "Invalid parameters for 'trans'"
+
                 else:
-                    raise TemplateSyntaxError, "only option for 'trans' is 'noop'"
+                    # no as keyword, thus we must be using 'noop'
+                    as_var = False
+                    noop   = True
+                    
             else:
-                noop = False
-            return (value, noop)
-    value, noop = TranslateParser(token.contents).top()
-    return TranslateNode(value, noop)
+                as_var = False
+                noop   = False
+            return (value, noop, as_var)
+    value, noop, as_var = TranslateParser(token.contents).top()
+    return TranslateNode(value, noop, as_var)
 
 def do_block_translate(parser, token):
     """