Ticket #7239: patch_django_7239.20080809.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
-
@@ -203 +204 @@
-        There are {{ count }} objects.
-        {% endblocktrans %}
-
+    In latest development version it supports url too::
+
+        {% blocktrans url path.to.some_view arg1,arg2,name1=value1 as myurl %}
+        This is a <a href="{{ myurl }}" title="">link</a>.
+        {% endblocktrans %}
+
-    This is much like ngettext, only in template syntax.
-    """
-    class BlockTranslateParser(TokenParser):
@@ -218 +225 @@
-                        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':

tests/regressiontests/templates/tests.py

@@ -753 +753 @@
-            # translation of plural form
-            'i18n08': ('{% load i18n %}{% blocktrans count number as counter %}singular{% plural %}{{ counter }} plural{% endblocktrans %}', {'number': 2}, "2 plural"),
-
+            # translation with an url, success
+            'i18n09': ('{% load i18n %}{% blocktrans url regressiontests.templates.views.client client.id as url %}<a href="{{ url }}" title="">link</a>{% endblocktrans %}', {'client': {'id': 1}}, '<a href="/url_tag/client/1/" title="">link</a>'),
+            'i18n10': ('{% load i18n %}{% blocktrans url regressiontests.templates.views.client_action client.id,action="update" as url %}<a href="{{ url }}" title="">link</a>{% endblocktrans %}', {'client': {'id': 1}}, '<a href="/url_tag/client/1/update/" title="">link</a>'),
+            'i18n11': ('{% load i18n %}{% blocktrans url regressiontests.templates.views.index as url %}<a href="{{ url }}" title="">link</a>{% endblocktrans %}', {}, '<a href="/url_tag/" title="">link</a>'),
+            'i18n12': ('{% load i18n %}{% blocktrans url named.client client.id as url %}<a href="{{ url }}" title="">link</a>{% endblocktrans %}', {'client': {'id': 1}}, '<a href="/url_tag/named-client/1/" title="">link</a>'),
+            'i18n13': (u'{% load i18n %}{% blocktrans url метка_оператора v as url %}<a href="{{ url }}" title="">link</a>{% endblocktrans %}', {'v': u'Ω'},
+                    '<a href="/url_tag/%D0%AE%D0%BD%D0%B8%D0%BA%D0%BE%D0%B4/%CE%A9/" title="">link</a>'),
+            
+            # translation with an url, failure
+            'i18n13': ('{% load i18n %}{% blocktrans url %}{% endblocktrans %}', {}, template.TemplateSyntaxError),
+            'i18n14': ('{% load i18n %}{% blocktrans url no_such_view %}{% endblocktrans %}', {}, template.TemplateSyntaxError),
+            'i18n15': ('{% load i18n %}{% blocktrans url no_such_view as no_such_view_url %}{% endblocktrans %}', {}, urlresolvers.NoReverseMatch),
+            'i18n16': ('{% load i18n %}{% blocktrans url regressiontests.templates.views.client as client_url %}{% endblocktrans %}', {}, urlresolvers.NoReverseMatch),
+
+            # translation with combined arguments (with, count and/or url)
+            'i18n17': ('{% load i18n %}{% blocktrans with anton|lower as berta count number as counter %}{{ berta }} singular{% plural %}{{ berta }} {{ counter }} plural{% endblocktrans %}', {'anton': '\xc3\x85', 'number': 1}, u'å singular'),
+            'i18n18': ('{% load i18n %}{% blocktrans count number as counter with anton|lower as berta %}{{ berta }} singular{% plural %}{{ berta }} {{ counter }} plural{% endblocktrans %}', {'anton': '\xc3\x85', 'number': 2}, u'å 2 plural'),
+            'i18n19': ('{% load i18n %}{% blocktrans with anton|lower as berta url regressiontests.templates.views.client client.id as url %}{{ berta }} <a href="{{ url }}" title="">link</a>{% endblocktrans %}', {'client': {'id': 1}, 'anton': '\xc3\x85'}, u'å <a href="/url_tag/client/1/" title="">link</a>'),
+            'i18n20': ('{% load i18n %}{% blocktrans url regressiontests.templates.views.client client.id as url with anton|lower as berta %}{{ berta }} <a href="{{ url }}" title="">link</a>{% endblocktrans %}', {'client': {'id': 1}, 'anton': '\xc3\x85'}, u'å <a href="/url_tag/client/1/" title="">link</a>'),
+            'i18n21': ('{% load i18n %}{% blocktrans count number as counter url regressiontests.templates.views.client client.id as url %}{{ url }} singular{% plural %}{{ url }} {{ counter }} plural{% endblocktrans %}', {'client': {'id': 1}, 'number': 1}, u'/url_tag/client/1/ singular'),
+            'i18n22': ('{% load i18n %}{% blocktrans url regressiontests.templates.views.client client.id as url count number as counter %}{{ url }} singular{% plural %}{{ url }} {{ counter }} plural{% endblocktrans %}', {'client': {'id': 1}, 'number': 2}, u'/url_tag/client/1/ 2 plural'),
+            'i18n23': ('{% load i18n %}{% blocktrans with anton|lower as berta and foo as bar count number as counter url regressiontests.templates.views.client client.id as url %}{{ berta }} {{ bar }} {{ url }} singular{% plural %}{{ berta }} {{ bar }} {{ url }} {{ counter }} plural{% endblocktrans %}', {'client': {'id': 1}, 'number': 1, 'anton': '\xc3\x85', 'foo': 'baz'}, u'å baz /url_tag/client/1/ singular'),
+            'i18n24': ('{% load i18n %}{% blocktrans url regressiontests.templates.views.client client.id as url count number as counter with anton|lower as berta %}{{ berta }} {{ url }} singular{% plural %}{{ berta }} {{ url }} {{ counter }} plural{% endblocktrans %}', {'client': {'id': 1}, 'number': 2, 'anton': '\xc3\x85'}, u'å /url_tag/client/1/ 2 plural'),
+            
-            # simple non-translation (only marking) of a string to german
-09
+25
-
-            # translation of a variable with a translated filter
-10
+26
-
-            # translation of a variable with a non-translated filter
-11
+27
-
-            # usage of the get_available_languages tag
-12
+28
-
-            # translation of constant strings
-13
-14
-15
-16
+29
+30
+31
+32
-
-            # Escaping inside blocktrans works as if it was directly in the
-            # template.
-17
-18
+33
+34
-
-            ### HANDLING OF TEMPLATE_STRING_IF_INVALID ###################################
-

AUTHORS

@@ -239 +239 @@
-    Nick Lane <nick.lane.au@gmail.com>
-    Stuart Langridge <http://www.kryogenix.org/>
-    Paul Lanier <planier@google.com>
+    David Larlet <http://david.larlet.fr>
-    Nicola Larosa <nico@teknico.net>
-    Lau Bech Lauritzen
-    Rune Rønde Laursen <runerl@skjoldhoej.dk>

docs/i18n.txt

@@ -260 +260 @@
-    There are {{ counter }} {{ name }} objects.
-    {% endblocktrans %}
-
+**New in development version:** If you need to use `url template tag`_, you 
+can specify it within ``{% blocktrans %}``, as ``count`` above. Example::
+
+    {% blocktrans url path.to.some_view arg1,arg2,name1=value1 as myurl %}
+    This is a <a href="{{ myurl }}" title="">link</a>.
+    {% endblocktrans %}
+
-Internally, all block and inline translations use the appropriate
-``ugettext`` / ``ungettext`` call.
-
@@ -302 +309 @@
-    (keeping the comma intact).
-
-.. _Django templates: ../templates_python/
+.. _url template tag: ../templates/#url
-
-Working with lazy translation objects
--------------------------------------