Issue 2139 - Allow nested translations for tag attributes.

cms/converters.py

 # coding: utf-8
 
 # This file is part of the Adblock Plus web scripts,
 # Copyright (C) 2006-2015 Eyeo GmbH
 #
 # Adblock Plus is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3 as
 # published by the Free Software Foundation.
 #
 # Adblock Plus is distributed in the hope that it will be useful,
@@ skipping 127 matching lines @@
     else:
       result = default
 
     # Insert fixed strings
     for i in range(len(fixed_strings)):
       result = re.sub(r"\{%d\}" % (i + 1), fixed_strings[i], result, 1)
 
     # Insert attributes
     result = escape(result)
     def stringify_attribute((name, value)):
+      value = self.insert_localized_strings(value, escapes)
       if name == "href":
         link_locale, link = self._params["source"].resolve_link(value, locale)
         if link:
           return 'href="%s" hreflang="%s"' % (escape(link), escape(link_locale))
       return '%s="%s"' % (escape(name), escape(value))
 
     for tag in self.whitelist:
       saved = saved_attributes.get(tag, [])
       for attrs in saved:
         attrs = map(stringify_attribute, attrs)
@@ skipping 12 matching lines @@
   def insert_localized_strings(self, text, escapes, to_html=lambda s: s):
     def lookup_string(match):
       name, comment, default = match.groups()
       default = to_html(default).strip()
 
       # Note: We currently ignore the comment, it is only relevant when
       # generating the master translation.
       return self.localize_string(name, default, self._params["localedata"], escapes)
 
     return re.sub(
-      r"\{\{\s*([\w\-]+)(?:\[(.*?)\])?\s+(.*?)\}\}",
+      r"\{\{\s*"
+      r"([\w\-]+)" # String ID
+      r"(?:\[(.*?)\])?" # Optional comment
+      r"\s+"
+      r"((?:[^\{]|\{(?!\{)|\{\{(?:[^\}]|\}(?!\}))*?\}\})*?)" # Translatable text
+      r"\}\}",
       lookup_string,
       text,
       flags=re.S
     )
 
   def process_links(self, text):
     def process_link(match):
       pre, attr, url, post = match.groups()
       url = jinja2.Markup(url).unescape()
 
@@ skipping 196 matching lines @@
         stack.pop()
       stack[-1]["subitems"].append(item)
       stack.append(item)
     return structured
 
 converters = {
   "html": RawConverter,
   "md": MarkdownConverter,
   "tmpl": TemplateConverter,
 }