Issue 5751 - Removing legacy gecko support

packagerChrome.py

Index: packagerChrome.py
diff --git a/packagerChrome.py b/packagerChrome.py
index 3df00251c28929f6536978ab7f18ef2e48b7cc4b..8e20814137c690f4e445fe01736e34f8a1459d87 100644
--- a/packagerChrome.py
+++ b/packagerChrome.py
@@ -190,28 +190,6 @@ def toJson(data):
     ).encode('utf-8') + '\n'
 
 
-def import_string_webext(data, key, source):
-    """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)
-    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
 
@@ -249,17 +227,8 @@ def import_locales(params, files):
             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
+                with io.open(sourceFile, 'r', encoding='utf-8') as handle:
+                    sourceData = json.load(handle)
 
                 # Resolve wildcard imports
                 if keys == '*' or keys == '=*':
@@ -283,7 +252,7 @@ def import_locales(params, files):
                         if key in data:
                             print 'Warning: locale string %s defined multiple times' % key
 
-                        import_string(data, key, sourceData[stringID])
+                        data[key] = sourceData[stringID]
             except Exception as e:
                 print 'Warning: error importing locale data from %s: %s' % (sourceFile, e)