Issue 2936 - Support syntax for duplicate 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 118 matching lines @@
   def localize_string(self, page, name, default, comment, localedata, escapes):
     def escape(s):
       return re.sub(r".",
         lambda match: escapes.get(match.group(0), match.group(0)),
         s, flags=re.S)
     def re_escape(s):
       return re.escape(escape(s))
 
     # Handle duplicated strings
     if default:
-      self._seen_defaults[(page, name)] = default
+      self._seen_defaults[(page, name)] = (default, comment)
     else:
       try:
-        default = self._seen_defaults[(page, name)]
+        default, comment = self._seen_defaults[(page, name)]
       except KeyError:
         raise Exception("Text not yet defined for string %s on page %s" %
                         (name, page))
 
     # Extract tag attributes from default string
     default, saved_attributes, fixed_strings = self._attribute_parser.parse(default, self._params["page"])
 
     # Get translation
     locale = self._params["locale"]
     if locale == self._params["defaultlocale"]:
       result = default
     elif name in localedata:
       result = localedata[name].strip()
     else:
       result = default
       self.missing_translations += 1
     self.total_translations += 1
 
-    if default:
-      # Perform callback with the string if required,
-      # e.g. for the translations script
-      callback = self._params["localized_string_callback"]
-      if callback:
-        callback(page, locale, name, result, comment, fixed_strings)
+    # Perform callback with the string if required, e.g. for the translations script
+    callback = self._params["localized_string_callback"]
+    if callback:
+      callback(page, locale, name, result, comment, fixed_strings)
+
 
     # Insert fixed strings
     for i, fixed_string in enumerate(fixed_strings, 1):
       result = result.replace("{%d}" % i, fixed_string)
 
     # Insert attributes
     result = escape(result)
     def stringify_attribute((name, value)):
       return '%s="%s"' % (
         escape(name),
@@ skipping 241 matching lines @@
         stack.pop()
       stack[-1]["subitems"].append(item)
       stack.append(item)
     return structured
 
 converters = {
   "html": RawConverter,
   "md": MarkdownConverter,
   "tmpl": TemplateConverter,
 }