Make sure that translations used in manifest.json exist in all languages

packagerChrome.py

 # coding: utf-8
 
 # This file is part of the Adblock Plus build tools,
 # Copyright (C) 2006-2013 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 268 matching lines @@
     for chromeLocale, operaLocale in operaMapping.iteritems():
       chromeFile = '_locales/%s/messages.json' % chromeLocale
       operaFile = '_locales/%s/messages.json' % operaLocale if operaLocale != None else None
       if chromeFile in files:
         if operaFile != None:
           files[operaFile] = files[chromeFile]
         del files[chromeFile]
 
 def fixMissingTranslations(files):
   # Chrome requires messages used in manifest.json to be given in all languages
-  defaults = []
-  for name, info in json.loads(files['_locales/%s/messages.json' % defaultLocale]).iteritems():
-    if '__MSG_%s__' % name in files['manifest.json']:
-      defaults.append((name, info))

[Wladimir Palant, 2014/03/13 15:21:45]

This seems backwards, shouldn't we search for __MSG_(\S+)__ in manifest.json?
Like:

  with json.loads(files["_locales/%s/messages.json" % defaultLocale]) as
localeData:
    for match in re.finditer(r"__MSG_(\S+)__", files["manifest.json"]):
      defaults[match.group(1)] = localeData[match.group(1)]

Note that this raising an exception on strings missing from default locale can
be considered a desired side-effect.

[Sebastian Noack, 2014/03/13 15:44:33]

Done.

+  defaults = {}
+  data = json.loads(files['_locales/%s/messages.json' % defaultLocale])
+  for match in re.finditer(r'__MSG_(\S+)__', files['manifest.json']):
+    name = match.group(1)
+    defaults[name] = data[name]
 
   for filename in files:
     if not filename.startswith('_locales/') or not filename.endswith('/messages.json'):
       continue
 
     data = json.loads(files[filename])
-    for name, info in defaults:
+    for name, info in defaults.iteritems():
       data.setdefault(name, info)
 
     files[filename] = toJson(data)
 
 def signBinary(zipdata, keyFile):
   import M2Crypto
   if not os.path.exists(keyFile):
     M2Crypto.RSA.gen_key(1024, 65537, callback=lambda x: None).save_key(keyFile, cipher=None)
   key = M2Crypto.EVP.load_key(keyFile)
   key.sign_init()
@@ skipping 98 matching lines @@
   def shutdown_server(server):
     time.sleep(10)
     server.shutdown()
   thread.start_new_thread(shutdown_server, (server,))
   server.serve_forever()
 
   if connections[0] == 0:
     print 'Warning: No incoming connections, extension probably not active in the browser yet'
   else:
     print 'Handled %i connection(s)' % connections[0]