Issue 5751 - Removing legacy gecko support

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 @@
         ).encode('utf-8')
 
 
 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 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):
     for item in params['metadata'].items('import_locales'):
         filename, keys = item
         for sourceFile in glob.glob(os.path.join(os.path.dirname(item.source),
                                                  *filename.split('/'))):
-            parts = sourceFile.split(os.path.sep)
-            locale = parts[-2].replace('-', '_')
+            locale = sourceFile.split(os.path.sep)[-2].replace('-', '_')

[Sebastian Noack, 2017/10/06 19:13:28]

As pointed out on the review introducing this code, replacing dashes with
underscores are no longer necessary, once all paths are assumed to use ISO
format (i.e. underscored) for language codes.

[tlucas, 2017/10/09 23:18:07]

Done.

             targetFile = os.path.join('_locales', locale, 'messages.json')
             data = json.loads(files.get(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:
-                    import localeTools
-                    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 == '=*':
                     importList = sourceData.keys()
                     importList = filter(lambda k: not k.startswith('_'), importList)
                     if keys == '=*':
                         importList = map(lambda k: '=' + k, importList)
                     keys = ' '.join(importList)
 
                 for stringID in keys.split():
                     noMangling = False
                     if stringID.startswith('='):
                         stringID = stringID[1:]
-                        noMangling = True

[Sebastian Noack, 2017/10/06 19:13:28]

Since you are unsupporting the mangle feature, it seems "=*" will be equivalent
to "*", and "=string" to "string", right? If so, we can get rid of the syntax
with the leading equals sign all together, and just adapt the metadata.* files
in adblockpluschrome, once these changes get integrated. It wouldn't be the only
thing we have to adapt for, anyway. Feel free to document any further required
adaptions in https://issues.adblockplus.org/ticket/5837.

[tlucas, 2017/10/09 23:18:07]

Done. I also adjusted the content in #5837 - feel free to proofread it.

[Sebastian Noack, 2017/10/10 04:51:40]

I don't see any change to the description of #5837 by anybody but me. Did you
submit your changes?

 
                     if stringID in sourceData:
-                        if noMangling:
-                            key = re.sub(r'\W', '_', stringID)
-                        else:
-                            key = re.sub(r'\..*', '', parts[-1]) + '_' + re.sub(r'\W', '_', stringID)
+                        key = re.sub(r'\W', '_', stringID)

[Sebastian Noack, 2017/10/06 19:13:29]

This should no longer be necessary either, as we will only import strings that
are already in the same format, now.

[tlucas, 2017/10/09 23:18:07]

A quick test verified your assumption, this line has no effect for all targets -
removed it.

                         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)
 
             files[targetFile] = toJson(data)
 
 
 def truncate(text, length_limit):
     if len(text) <= length_limit:
         return text
     return text[:length_limit - 1].rstrip() + u'\u2026'
@@ skipping 129 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)