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 142 matching lines @@
       pass
 
     # Source files of the conversion shouldn't be part of the build
     for sourceFile in sourceFiles:
       if sourceFile in files:
         del files[sourceFile]
 
     sourceFiles = map(lambda f: os.path.abspath(os.path.join(baseDir, f)), sourceFiles)
     files[file] = doRewrite(sourceFiles, args)
 
+def toJson(data):
+  return json.dumps(
+    data, ensure_ascii=False, sort_keys=True,
+    indent=2, separators=(',', ': ')
+  ).encode('utf-8') + '\n'
+
 def importGeckoLocales(params, files):
   import localeTools
 
   localeCodeMapping = {
     'ar': 'ar',
     'bg': 'bg',
     'ca': 'ca',
     'cs': 'cs',
     'da': 'da',
     'de': 'de',
@@ skipping 81 matching lines @@
             if match:
               value = match.group(1)
             else:
               index = value.find("&")
               if index >= 0:
                 value = value[0:index] + value[index + 1:]
             data[key] = {'message': value}
       except Exception, e:
         print 'Warning: error importing locale data from %s: %s' % (sourceFile, e)
 
-      files[targetFile] = json.dumps(data, ensure_ascii=False, sort_keys=True,
-                            indent=2, separators=(',', ': ')).encode('utf-8') + '\n'
+      files[targetFile] = toJson(data)
 
   if params['type'] == 'opera':
     # Opera has a slightly different locale mapping
     operaMapping = {
       'es': 'es_ES',
       'es_419': None,
       'pt': 'pt_PT',
     }
     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.

+
+  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:
+      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()
   key.sign_update(zipdata)
   return key.final()
 
 def getPublicKey(keyFile):
@@ skipping 44 matching lines @@
 
   if metadata.has_section('preprocess'):
     files.preprocess(
       [f for f, _ in metadata.items('preprocess')],
       {'needsExt': True}
     )
 
   if metadata.has_section('import_locales'):
     importGeckoLocales(params, files)
 
+  fixMissingTranslations(files)
+
   if devenv:
     files['devenvPoller__.js'] = createPoller(params)
 
   if (metadata.has_option('general', 'backgroundScripts') and
       'lib/info.js' in re.split(r'\s+', metadata.get('general', 'backgroundScripts')) and
       'lib/info.js' not in files):
     files['lib/info.js'] = createInfoModule(params)
 
   zipdata = files.zipToString()
   signature = None
@@ skipping 28 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]