Ticket #4713: __init__.2.diff

django/template/__init__.py

@@ -89 +89 @@
                                           re.escape(VARIABLE_TAG_START), re.escape(VARIABLE_TAG_END),
                                           re.escape(COMMENT_TAG_START), re.escape(COMMENT_TAG_END)))
 
+# matches if the string is marked for translation
+trans_re = re.compile(r'_\((\'|").*?(\'|")\)')
+                                          
 # global dictionary of libraries that have been loaded using get_library
 libraries = {}
 # global list of libraries to load by default for a new parser
@@ -691 +694 @@
             # we're also dealing with a literal.
             if var[0] in "\"'" and var[0] == var[-1]:
                 self.literal = var[1:-1]
-            
+            # If it isn't a literal, check if it's marked for translation.
+            elif trans_re.match(var):
+                self.literal = _(var[3:-2])
             else:
                 # Otherwise we'll set self.lookups so that resolve() knows we're
                 # dealing with a bonafide variable