Issue 2625 - [cms] Crowdin synchronisation script

cms/sources.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 151 matching lines @@
   def has_locale(self, locale, page):
     config = self.read_config()
     try:
       page = config.get("locale_overrides", page)
     except ConfigParser.Error:
       pass
     return self.has_file(self.locale_filename(locale, page))
 
   def read_locale(self, locale, page):
     default_locale = self.read_config().get("general", "defaultlocale")
-    if locale == default_locale:
-      result = collections.OrderedDict()
-    else:
-      result = collections.OrderedDict(self.read_locale(default_locale, page))
+    result = collections.OrderedDict()
+    if locale != default_locale:
+      result.update(self.read_locale(default_locale, page))
 
     if self.has_locale(locale, page):
       filedata = self.read_file(self.locale_filename(locale, page))
       localedata = json.loads(filedata)
       for key, value in localedata.iteritems():
         result[key] = value["message"]
 
     return result
 
   #
@@ skipping 102 matching lines @@
         path = os.path.join(dir, filename)
         if os.path.isfile(path):
           result.append(relpath + filename)
         elif os.path.isdir(path):
           do_list(path, relpath + filename + "/")
     do_list(self.get_path(subdir), "")
     return result
 
   def get_cache_dir(self):
     return os.path.join(self._dir, "cache")