Ticket #7239: patch_django_7239.20080530.diff

django/templatetags/i18n.py

@@ -3 +3 @@
-from django.template import Node, Variable, VariableNode
-from django.template import TemplateSyntaxError, TokenParser, Library
-from django.template import TOKEN_TEXT, TOKEN_VAR
+from django.template.defaulttags import URLNode
-from django.utils import translation
-from django.utils.encoding import force_unicode
-
@@ -218 +219 @@
-                        raise TemplateSyntaxError, "variable bindings in 'blocktrans' must be 'with value as variable'"
-                    extra_context[self.tag()] = VariableNode(
-                            parser.compile_filter(value))
+                elif tag == 'url':
+                    args = []
+                    kwargs = {}
+                    value = self.value()
+                    next_tag = self.tag()
+                    if next_tag != 'as':
+                        if self.tag() != 'as':
+                            raise TemplateSyntaxError, "variable bindings in 'blocktrans' must be 'url path.to.some_view arg1,arg2,name1=value1 as variable'"
+                        else:
+                            # can't find  way to do not duplicate code from url tag
+                            for arg in next_tag.split(','):
+                                if '=' in arg:
+                                    k, v = arg.split('=', 1)
+                                    k = k.strip()
+                                    kwargs[k] = parser.compile_filter(v)
+                                else:
+                                    args.append(parser.compile_filter(arg))
+                    extra_context[self.tag()] = URLNode(value, args, kwargs)
-                elif tag == 'count':
-                    counter = parser.compile_filter(self.value())
-                    if self.tag() != 'as':