[Pkg-mozext-commits] [adblock-plus] 383/464: Consider different locale mapping for Opera locales

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository adblock-plus.

commit df6aaabbcf8ad85c1ca92cef0b342add66ae5d43
Author: Wladimir Palant <trev at adblockplus.org>
Date:   Fri May 24 16:04:44 2013 +0200

    Consider different locale mapping for Opera locales
---
 packagerChrome.py | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/packagerChrome.py b/packagerChrome.py
index 9b4ad31..fd0261b 100644
--- a/packagerChrome.py
+++ b/packagerChrome.py
@@ -250,6 +250,20 @@ def importGeckoLocales(params, files):
       files[targetFile] = json.dumps(data, ensure_ascii=False, sort_keys=True,
                             indent=2, separators=(',', ': ')).encode('utf-8') + '\n'
 
+  if params['type'] == 'opera':
+    # Opera has a slightly different locale mapping
+    operaMapping = {
+      'es': 'es_ES',
+      'es_419': 'es_LA',
+      'pt': 'pt_PT',
+    }
+    for chromeLocale, operaLocale in operaMapping.iteritems():
+      chromeFile = '_locales/%s/messages.json' % chromeLocale
+      operaFile = '_locales/%s/messages.json' % operaLocale
+      if chromeFile in files:
+        files[operaFile] = files[chromeFile]
+        del files[chromeFile]
+
 def signBinary(zipdata, keyFile):
   import M2Crypto
   if not os.path.exists(keyFile):
@@ -282,6 +296,7 @@ def createBuild(baseDir, type='chrome', outFile=None, buildNum=None, releaseBuil
     outFile = getDefaultFileName(baseDir, metadata, version, 'crx' if keyFile else 'zip')
 
   params = {
+    'type': type,
     'baseDir': baseDir,
     'releaseBuild': releaseBuild,
     'version': version,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/adblock-plus.git