Ticket #5885: template_simple_tag_i18n_fix.2.diff

django/template/__init__.py

@@ -127 +127 @@
         self.params = params
 
     def __str__(self):
-        return self.msg % self.params
-
+        try:
+            return self.msg % self.params
+        except UnicodeDecodeError:
+            return self.msg % (self.params[0],str(self.params[1]))
+        
 class InvalidTemplateLibrary(Exception):
     pass
 
@@ -692 +695 @@
             if var[0] in "\"'" and var[0] == var[-1]:
                 self.literal = var[1:-1]
             
+            elif var[0:2] == "_(" and var[-1] == ")":
+                match = re.match("\_\(('(?:[^']+')|(?:\"[^\"]+)\")\)",var)
+                if match is not None:
+                    self.literal = _(match.group(1)[1:-2])
+                else:
+                    raise AttributeError('Invalid translation string %s.'%var)
             else:
                 # Otherwise we'll set self.lookups so that resolve() knows we're
                 # dealing with a bonafide variable