Issue 2112 - Support fixed text in strings.

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 121 matching lines @@
     default, saved_attributes, fixed_strings = self._attribute_parser.parse(default, self._params["page"])
 
     # Get translation
     if self._params["locale"] != self._params["defaultlocale"] and name in localedata:
       result = localedata[name].strip()
     else:
       result = default
 
     # Insert fixed strings
     for i in range(len(fixed_strings)):
-      result = re.sub(re_escape("{%d}" % (i + 1)), fixed_strings[i], result, 1)

[Wladimir Palant, 2015/03/27 07:29:48]

The string isn't escaped yes, meaning that we shouldn't escape our search string
either - re.sub(r"\{%d\}" % (i + 1), ...) will do.

[kzar, 2015/03/27 09:50:44]

Done.

+      result = re.sub(r"\{%d\}" % (i + 1), fixed_strings[i], result, 1)
 
     # Insert attributes
     result = escape(result)
     for tag in self.whitelist:
       saved = saved_attributes.get(tag, [])
       for attrs in saved:
         attrs = map(lambda (name, value): '%s="%s"' % (escape(name), escape(value)), attrs)
         result = re.sub(
           r"%s([^<>]*?)%s" % (re_escape("<%s>" % tag), re_escape("</%s>" % tag)),
           r'<%s %s>\1</%s>' % (tag, " ".join(attrs), tag),
@@ skipping 218 matching lines @@
         stack.pop()
       stack[-1]["subitems"].append(item)
       stack.append(item)
     return structured
 
 converters = {
   "html": RawConverter,
   "md": MarkdownConverter,
   "tmpl": TemplateConverter,
 }