Issue 5477 - Import everything from imported locales

packagerChrome.py

 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 import errno
 import io
 import json
 import os
 import re
 from StringIO import StringIO
@@ skipping 173 matching lines @@
 
 
 def toJson(data):
     return json.dumps(
         data, ensure_ascii=False, sort_keys=True,
         indent=2, separators=(',', ': ')
     ).encode('utf-8') + '\n'
 
 
 def import_string_webext(data, key, source):
-    """Import source-dict into data."""

[Wladimir Palant, 2017/08/21 13:59:05]

Nit: "Import a single translation from source dictionary into data"?

[tlucas, 2017/08/22 08:00:50]

Done.

+    """Import a single translation from the source dictionary into data"""
     data[key] = source
 
 
 def import_string_gecko(data, key, value):
     """Import Gecko-style locales into data.
 
     Only sets {'message': value} in the data-dictionary, after stripping
     undesired Gecko-style access keys.
     """
     match = re.search(r'^(.*?)\s*\(&.\)$', value)
@@ skipping 41 matching lines @@
             if not os.path.exists(sourceFile) or os.path.exists(incompleteMarker):
                 continue
 
             data = json.loads(files[targetFile].decode('utf-8'))
 
             try:
                 # The WebExtensions (.json) and Gecko format provide
                 # translations differently and/or provide additional
                 # information like e.g. "placeholders". We want to adhere to
                 # that and preserve the addtional info.
-

[Sebastian Noack, 2017/08/22 07:38:11]

Nit: The blank line here seems out of place.

[tlucas, 2017/08/22 08:00:50]

Done.

                 if sourceFile.endswith('.json'):
                     with io.open(sourceFile, 'r', encoding='utf-8') as handle:
                         sourceData = json.load(handle)
                     import_string = import_string_webext
                 else:
                     sourceData = localeTools.readFile(sourceFile)
                     import_string = import_string_gecko
 
                 # Resolve wildcard imports
                 if keys == '*' or keys == '=*':
@@ skipping 150 matching lines @@
                 params, 'testIndex.html.tmpl', ('general', 'testScripts')
             )
 
     zipdata = files.zipToString()
     signature = None
     pubkey = None
     if keyFile != None:
         signature = signBinary(zipdata, keyFile)
         pubkey = getPublicKey(keyFile)
     writePackage(outFile, pubkey, signature, zipdata)