Ticket #8994: 8994-2.patch

django/template/defaulttags.py

@@ -351 +351 @@
         return self.mapping.get(self.tagtype, '')
 
 class URLNode(Node):
-    def __init__(self, view_name, args, kwargs):
+    def __init__(self, view_name, var_name, args, kwargs):
         self.view_name = view_name
+        self.var_name = var_name
         self.args = args
         self.kwargs = kwargs
 
@@ -362 +363 @@
         kwargs = dict([(smart_str(k,'ascii'), v.resolve(context))
                        for k, v in self.kwargs.items()])
         try:
-            return reverse(self.view_name, args=args, kwargs=kwargs)
+            r = reverse(self.view_name, args=args, kwargs=kwargs)
         except NoReverseMatch:
             project_name = settings.SETTINGS_MODULE.split('.')[0]
-            return reverse(project_name + '.' + self.view_name,
+            r = reverse(project_name + '.' + self.view_name,
                            args=args, kwargs=kwargs)
+        if self.var_name:
+            context[self.var_name] = r
+            return ''
+        else:
+            return r
 
 class WidthRatioNode(Node):
     def __init__(self, val_expr, max_expr, max_width):
@@ -1010 +1016 @@
     return TemplateTagNode(tag)
 templatetag = register.tag(templatetag)
 
+#@register.url
 def url(parser, token):
     """
     Returns an absolute URL matching given view with its parameters.
@@ -1040 +1047 @@
         {% url app_name.client client.id %}
 
     The URL will look like ``/clients/client/123/``.
+    
+    If you need to save the url to a context variable instead of inserting the url 
+    where the tag is use the syntax::
+    
+        {% url path.to.some_view arg1,arg2,name1=value1 %}
+    
+    This is useful for translated text which cannot contain tags, so you need to use
+    variables instead.
     """
-    bits = token.contents.split(' ', 2)
+    bits = token.contents.split(' ')
     if len(bits) < 2:
         raise TemplateSyntaxError("'%s' takes at least one argument"
                                   " (path to a view)" % bits[0])
+    if bits[-2] == "as":
+        var_name = bits[-1]
+        bits = bits[:-2]
+    else:
+        var_name = None
+    print bits
     args = []
     kwargs = {}
     if len(bits) > 2:
@@ -1055 +1076 @@
                 kwargs[k] = parser.compile_filter(v)
             else:
                 args.append(parser.compile_filter(arg))
-    return URLNode(bits[1], args, kwargs)
+    return URLNode(bits[1],var_name, args, kwargs)
 url = register.tag(url)
 
 #@register.tag