Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Unified Diff: packagerChrome.py

Issue 5307739131609088: Issue 1709 - Allow importing Chrome-style locales in Chrome extensions (Closed)
Patch Set: Simplified mapping calculation Created Dec. 17, 2014, 1:20 p.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: packagerChrome.py
===================================================================
--- a/packagerChrome.py
+++ b/packagerChrome.py
@@ -1,15 +1,20 @@
# 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, os, re, json, struct
+import sys
+import os
+import re
+import json
+import struct
+import io
from StringIO import StringIO
import packager
from packager import readMetadata, getMetadataPath, getDefaultFileName, getBuildVersion, getTemplate, Files
defaultLocale = 'en_US'
def getIgnoredFiles(params):
@@ -157,78 +162,51 @@ 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
- localeCodeMapping = {
- 'ar': 'ar',
- 'bg': 'bg',
- 'ca': 'ca',
- 'cs': 'cs',
- 'da': 'da',
- 'de': 'de',
- 'el': 'el',
- 'en-US': 'en_US',
- 'en-GB': 'en_GB',
- 'es-ES': 'es',
- 'es-AR': 'es_419',
- 'et': 'et',
- 'fi': 'fi',
- # '': 'fil', ???
- 'fr': 'fr',
- 'he': 'he',
- 'hi-IN': 'hi',
- 'hr': 'hr',
- 'hu': 'hu',
- 'id': 'id',
- 'it': 'it',
- 'ja': 'ja',
- 'ko': 'ko',
- 'lt': 'lt',
- 'lv': 'lv',
- 'nl': 'nl',
- # 'nb-NO': 'no', ???
- 'pl': 'pl',
- 'pt-BR': 'pt_BR',
- 'pt-PT': 'pt_PT',
- 'ro': 'ro',
- 'ru': 'ru',
- 'sk': 'sk',
- 'sl': 'sl',
- 'sr': 'sr',
- 'sv-SE': 'sv',
- 'th': 'th',
- 'tr': 'tr',
- 'uk': 'uk',
- 'vi': 'vi',
- 'zh-CN': 'zh_CN',
- 'zh-TW': 'zh_TW',
- }
+ # 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}
- for source, target in localeCodeMapping.iteritems():
+ # 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 d
Wladimir Palant 2014/12/17 14:59:33 Done.
+
+ # 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:
+ continue
for item in params['metadata'].items('import_locales'):
fileName, keys = item
parts = map(lambda n: source if n == '*' else n, fileName.split('/'))
sourceFile = os.path.join(os.path.dirname(item.source), *parts)
incompleteMarker = os.path.join(os.path.dirname(sourceFile), '.incomplete')
if not os.path.exists(sourceFile) or os.path.exists(incompleteMarker):
continue
- data = {}
- if targetFile in files:
- data = json.loads(files[targetFile].decode('utf-8'))
+ data = json.loads(files[targetFile].decode('utf-8'))
try:
- sourceData = localeTools.readFile(sourceFile)
+ if sourceFile.endswith('.json'):
+ with io.open(sourceFile, 'r', encoding='utf-8') as handle:
+ sourceData = {k: v['message'] for k, v in json.load(handle).iteritems()}
+ else:
+ sourceData = localeTools.readFile(sourceFile)
# 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)
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld