Issue 2450 - [cms] Extra semicolons being added to translatable 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 41 matching lines @@
     self._whitelist = whitelist
 
   def parse(self, text, pagename):
     self.reset()
     self._string = []
     self._fixed_strings = []
     self._inside_fixed = False
     self._attrs = {}
     self._pagename = pagename
 
+    # Force-escape ampersands, otherwise the parser will autocomplete bogus
+    # entities.
+    text = re.sub(r"&(?!\S+;)", "&", text)
+
     try:
       self.feed(text)
       return "".join(self._string), self._attrs, ["".join(s) for s in self._fixed_strings]
     finally:
       self._string = None
       self._attrs = None
       self._pagename = None
       self._inside_fixed = False
       self._fixed_strings = None
 
@@ skipping 323 matching lines @@
         stack.pop()
       stack[-1]["subitems"].append(item)
       stack.append(item)
     return structured
 
 converters = {
   "html": RawConverter,
   "md": MarkdownConverter,
   "tmpl": TemplateConverter,
 }