Issue 5477 - Import everything from imported locales

packagerChrome.py

Index: packagerChrome.py
diff --git a/packagerChrome.py b/packagerChrome.py
index 3e1a452a1a5b79fa7ff7316930ac911aab8162a6..8d42e8dc3d4f1cd2f97d72e71d2e7687ede03986 100644
--- a/packagerChrome.py
+++ b/packagerChrome.py
@@ -190,7 +190,21 @@ def toJson(data):
     ).encode('utf-8') + '\n'
 
 
-def importGeckoLocales(params, files):
+def set_full_dict(data, key, value, source, stringID):
+    """Sets data[key] to the desired {'message':value}, adds all additional
+    info from the source dict"""
+    data[key] = {'messages': value}
+    for k, v in source[stringID].items():
+        data[key].setdefault(k, v)
+
+
+def set_message_only(data, key, value, *args):
+    """only set {'message': value} in data-dictionary, API-consitent with
+    set_full_dict()"""
+    data[key] = {'message': value}
+
+
+def import_locales(params, files):
     import localeTools
 
     # FIXME: localeTools doesn't use real Chrome locales, it uses dash as
@@ -227,11 +241,19 @@ def importGeckoLocales(params, files):
             data = json.loads(files[targetFile].decode('utf-8'))
 
             try:
+                # .json and other formats provide translations differently and
+                # / or provide additional information like e.g. "placeholders".
+                # We want to adhere to that / preserve the addtional info
                 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)
+
+                    get_value = lambda x: x[stringID]['message']

[Sebastian Noack, 2017/08/17 16:32:34]

PEP-8 discourages assignment of lambda functions to variables, and suggests to
use def instead.This also causes an E731 with flake8, however, it might be
ignored for this file, because of legacy code that already uses this practice.

When turning get_value() into a proper function defined here, you also might
want to define set_translation() the same way for consistency.

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

Done.

+                    set_translation = set_full_dict
                 else:
                     sourceData = localeTools.readFile(sourceFile)
+                    get_value = lambda x: x[stringID]
+                    set_translation = set_message_only
 
                 # Resolve wildcard imports
                 if keys == '*' or keys == '=*':
@@ -256,7 +278,7 @@ def importGeckoLocales(params, files):
                             print 'Warning: locale string %s defined multiple times' % key
 
                         # Remove access keys
-                        value = sourceData[stringID]
+                        value = get_value(sourceData)
                         match = re.search(r'^(.*?)\s*\(&.\)$', value)
                         if match:
                             value = match.group(1)
@@ -264,7 +286,8 @@ def importGeckoLocales(params, files):
                             index = value.find('&')
                             if index >= 0:
                                 value = value[0:index] + value[index + 1:]
-                        data[key] = {'message': value}
+
+                        set_translation(data, key, value, sourceData, stringID)
             except Exception as e:
                 print 'Warning: error importing locale data from %s: %s' % (sourceFile, e)
 
@@ -380,7 +403,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':