Noissue - Added info.locale

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 ConfigParser
 import errno
 import glob
 import io
 import json
 import os
@@ skipping 133 matching lines @@
 
 def toJson(data):
     return json.dumps(
         data, ensure_ascii=False, sort_keys=True,
         indent=2, separators=(',', ': '),
     ).encode('utf-8') + '\n'
 
 
 def create_bundles(params, files, bundle_tests):
     base_extension_path = params['baseDir']
-    info_templates = {
-        'chrome': 'chromeInfo.js.tmpl',
-        'edge': 'edgeInfo.js.tmpl',
-        'gecko': 'geckoInfo.js.tmpl',
-    }
     aliases = {
         # To use our custom loader for the info module we must first set up an
         # alias to a file that exists.
         'info$': os.path.join(os.path.dirname(__file__), 'info.js'),
         # Prevent builtin Node.js modules from being used instead of our own
         # when the names clash. Once relative paths are used this won't be
         # necessary.
         'url$': 'url.js',
         'events$': 'events.js',
         'punycode$': 'punycode.js',
     }
     try:
         aliases.update(params['metadata'].items('module_alias'))
     except ConfigParser.NoSectionError:
         pass
 
     # Historically we didn't use relative paths when requiring modules, so in
     # order for webpack to know where to find them we need to pass in a list of
     # resolve paths. Going forward we should always use relative paths, once we
     # do that consistently this can be removed. See issues 5760, 5761 and 5762.
     resolve_paths = [os.path.join(base_extension_path, dir, 'lib')
                      for dir in ['', 'adblockpluscore', 'adblockplusui']]
 
-    info_template = getTemplate(info_templates[params['type']])
+    info_template = getTemplate('info.js.tmpl')
     info_module = info_template.render(
         basename=params['metadata'].get('general', 'basename'),
         version=params['version'],
+        type=params['type'],
     ).encode('utf-8')
 
     configuration = {
         'bundles': [],
         'extension_path': base_extension_path,
         'info_module': info_module,
         'resolve_paths': resolve_paths,
         'aliases': aliases,
     }
 
@@ skipping 202 matching lines @@
     if devenv:
         add_devenv_requirements(files, metadata, params)
 
     zipdata = files.zipToString()
     signature = None
     pubkey = None
     if keyFile != None:
         signature = signBinary(zipdata, keyFile)
         pubkey = getPublicKey(keyFile)
     writePackage(outFile, pubkey, signature, zipdata)