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):
-    """Sets data[key] to the desired {'message':value}, adds all additional
-    info from the source dict.
+    """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.
     """
-    value = source['message']
-
-    data[key] = {'messages': value}
-    for k, v in source.items():
-        data[key].setdefault(k, v)
-
-
-def import_string_gecko(data, key, value):
-    """Only sets {'message': value} in data-dictionary, after stripping
-    undesired gecko-style access keys.
-    """
-
-    # Remove access keys from possible gecko-style
-    # translations
     match = re.search(r'^(.*?)\s*\(&.\)$', value)
     if match:
         value = match.group(1)
     else:
         index = value.find('&')
         if index >= 0:
             value = value[0:index] + value[index + 1:]
 
     data[key] = {'message': value}
 
@@ skipping 32 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.
-
                 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 == '=*':
                     importList = sourceData.keys()
                     importList = filter(lambda k: not k.startswith('_'), importList)
                     if keys == '=*':
                         importList = map(lambda k: '=' + k, importList)
                     keys = ' '.join(importList)
 
@@ skipping 144 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)