Issue 5477 - Import everything from imported locales

packagerChrome.py

Index: packagerChrome.py
diff --git a/packagerChrome.py b/packagerChrome.py
index 3e1a452a1a5b79fa7ff7316930ac911aab8162a6..d56265921d84991e1cb3d2db7f045c6bea6de141 100644
--- a/packagerChrome.py
+++ b/packagerChrome.py
@@ -190,7 +190,36 @@ def toJson(data):
     ).encode('utf-8') + '\n'
 
 
-def importGeckoLocales(params, files):
+def import_string_webext(data, key, source):
+    """Sets data[key] to the desired {'message':value}, adds all additional
+    info from the source dict
+    """
+    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 set {'message': value} in data-dictionary, after stripping

[Sebastian Noack, 2017/08/18 15:26:14]

You capitalized the above docstring but not this one. Also if capatalized there
should be a full-stop at the end of the sentence.

[tlucas, 2017/08/18 15:34:18]

Done. Also added full-stop to the above docstring.

+    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}
+
+
+def import_locales(params, files):
     import localeTools
 
     # FIXME: localeTools doesn't use real Chrome locales, it uses dash as
@@ -227,12 +256,21 @@ def importGeckoLocales(params, files):
             data = json.loads(files[targetFile].decode('utf-8'))
 
             try:
+                # The WebExtensions (.json) and Gecko format  provide

[Sebastian Noack, 2017/08/18 15:26:14]

There is a redundant space in this line.

[tlucas, 2017/08/18 15:34:17]

Done.

+                # 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/18 15:26:14]

Missing full-stop at end of sentence.

[tlucas, 2017/08/18 15:34:17]

Done.

+
                 if sourceFile.endswith('.json'):
                     with io.open(sourceFile, 'r', encoding='utf-8') as handle:
-                        sourceData = {k: v['message'] for k, v in json.load(handle).iteritems()}
+                        sourceData = json.load(handle)
+
+                    set_translation = import_string_webext

[Sebastian Noack, 2017/08/18 15:26:14]

For consistency you might want to rename the set_translation variable to
import_string as well.

[tlucas, 2017/08/18 15:34:17]

Done.

                 else:
                     sourceData = localeTools.readFile(sourceFile)
 
+                    set_translation = import_string_gecko
+
                 # Resolve wildcard imports
                 if keys == '*' or keys == '=*':
                     importList = sourceData.keys()
@@ -255,16 +293,7 @@ def importGeckoLocales(params, files):
                         if key in data:
                             print 'Warning: locale string %s defined multiple times' % key
 
-                        # Remove access keys
-                        value = sourceData[stringID]
-                        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}
+                        set_translation(data, key, sourceData[stringID])
             except Exception as e:
                 print 'Warning: error importing locale data from %s: %s' % (sourceFile, e)
 
@@ -380,7 +409,7 @@ def createBuild(baseDir, type='chrome', outFile=None, buildNum=None, releaseBuil
         )
 
     if metadata.has_section('import_locales'):
-        importGeckoLocales(params, files)
+        import_locales(params, files)
 
     files['manifest.json'] = createManifest(params, files)
     if type == 'chrome':