Issue 1709 - Allow importing Chrome-style locales in Chrome extensions

packagerChrome.py

 # coding: utf-8
 
 # 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 sys
 import os
 import re
 import json
@@ skipping 149 matching lines @@
 
 def toJson(data):
   return json.dumps(
     data, ensure_ascii=False, sort_keys=True,
     indent=2, separators=(',', ': ')
   ).encode('utf-8') + '\n'
 
 def importGeckoLocales(params, files):
   import localeTools
 
+  # FIXME: localeTools doesn't use real Chrome locales, it uses dash as
+  # separator instead.
+  convert_locale_code = lambda code: code.replace('-', '_')
+
   # We need to map Chrome locales to Gecko locales. Start by mapping Chrome
-  # locales to themselves, merely with the minus sign as separator.
-  locale_mapping = {l.replace('-', '_'): l for l in localeTools.chromeLocales}
+  # locales to themselves, merely with the dash as separator.
+  locale_mapping = {convert_locale_code(l): l for l in localeTools.chromeLocales}
 
   # Convert values to Crowdin locales first (use Chrome => Crowdin mapping).
   for chrome_locale, crowdin_locale in localeTools.langMappingChrome.iteritems():
-    locale_mapping[chrome_locale.replace('-', '_')] = crowdin_locale

[Sebastian Noack, 2014/12/17 14:11:46]

I'd rather not duplicate the logic replacing the dashes, but moving it into a
function or lambda function.

  convert_language_codes = lambda code: code.replace('-', '_')

[Wladimir Palant, 2014/12/17 14:59:33]

Done.

+    locale_mapping[convert_locale_code(chrome_locale)] = crowdin_locale
 
   # Now convert values to Gecko locales (use Gecko => Crowdin mapping).
   reverse_mapping = {v: k for k, v in locale_mapping.iteritems()}
   for gecko_locale, crowdin_locale in localeTools.langMappingGecko.iteritems():
     if crowdin_locale in reverse_mapping:
       locale_mapping[reverse_mapping[crowdin_locale]] = gecko_locale
 
   for target, source in locale_mapping.iteritems():
     targetFile = '_locales/%s/messages.json' % target
     if not targetFile in files:
@@ skipping 181 matching lines @@
       'lib/info.js' not in files):
     files['lib/info.js'] = createInfoModule(params)
 
   zipdata = files.zipToString()
   signature = None
   pubkey = None
   if keyFile != None:
     signature = signBinary(zipdata, keyFile)
     pubkey = getPublicKey(keyFile)
   writePackage(outFile, pubkey, signature, zipdata)