Ticket #7412: i18n.diff

django/templatetags/i18n.py

@@ -4 +4 @@
 from django.template import TemplateSyntaxError, TokenParser, Library
 from django.template import TOKEN_TEXT, TOKEN_VAR
 from django.utils import translation
-from django.utils.encoding import force_unicode
+from django.utils.encoding import force_unicode, smart_unicode
 
 register = Library()
 
@@ -43 +43 @@
         if self.noop:
             return value
         else:
-            return translation.ugettext(value)
+            return translation.ugettext(smart_unicode(value))
 
 class BlockTranslateNode(Node):
     def __init__(self, extra_context, singular, plural=None, countervar=None,