Issue 2109 - Allow for translation of app independent repositories

localeTools.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 re, os, sys, codecs, json, urllib, urllib2
 from StringIO import StringIO
 from ConfigParser import SafeConfigParser
 from zipfile import ZipFile
@@ skipping 254 matching lines @@
 
   # Delete description from translations
   for key, value in parsed.iteritems():
     if "description" in value:
       del value["description"]
 
   file = codecs.open(path, 'wb', encoding='utf-8')
   json.dump(parsed, file, ensure_ascii=False, sort_keys=True, indent=2, separators=(',', ': '))
   file.close()
 
-def setupTranslations(projectName, localeConfig, key):
+def setupTranslations(localeConfig, projectName, key):
   # Make a new set from the locales list, mapping to Crowdin friendly format
   locales = {mapLocale(localeConfig['name_format'], locale)
              for locale in localeConfig['locales']}
 
   # Fill up with locales that we don't have but the browser supports
   if 'chrome' in localeConfig['target_platforms']:
     for locale in chromeLocales:
       locales.add(mapLocale('ISO-15897', locale))
 
   if 'gecko' in localeConfig['target_platforms']:
@@ skipping 33 matching lines @@
   body += '--%s--\r\n' % boundary
 
   body = body.encode('utf-8')
   request = urllib2.Request(url, StringIO(body))
   request.add_header('Content-Type', 'multipart/form-data; boundary=%s' % boundary)
   request.add_header('Content-Length', len(body))
   result = urllib2.urlopen(request).read()
   if result.find('<success') < 0:
     raise Exception('Server indicated that the operation was not successful\n' + result)
 
-def updateTranslationMaster(metadata, dir, projectName, localeConfig, key):
+def updateTranslationMaster(localeConfig, metadata, dir, projectName, key):
   result = json.load(urllib2.urlopen('http://api.crowdin.net/api/project/%s/info?key=%s&json=1' % (projectName, key)))
 
   existing = set(map(lambda f: f['name'], result['files']))
   add = []
   update = []
   for file in os.listdir(dir):
     path = os.path.join(dir, file)
     if os.path.isfile(path):
       if localeConfig['file_format'] == 'chrome-json' and file.endswith('.json'):
         data = preprocessChromeLocale(path, metadata, True)
@@ skipping 17 matching lines @@
   if len(add):
     titles = urllib.urlencode([('titles[%s]' % name, re.sub(r'\.json', '', name)) for name, data in add])
     postFiles(add, 'http://api.crowdin.net/api/project/%s/add-file?key=%s&type=chrome&%s' % (projectName, key, titles))
   if len(update):
     postFiles(update, 'http://api.crowdin.net/api/project/%s/update-file?key=%s' % (projectName, key))
   for file in existing:
     result = urllib2.urlopen('http://api.crowdin.net/api/project/%s/delete-file?key=%s&file=%s' % (projectName, key, file)).read()
     if result.find('<success') < 0:
       raise Exception('Server indicated that the operation was not successful\n' + result)
 
-def uploadTranslations(metadata, dir, locale, projectName, localeConfig, key):
+def uploadTranslations(localeConfig, metadata, dir, locale, projectName, key):
   files = []
   for file in os.listdir(dir):
     path = os.path.join(dir, file)
     if os.path.isfile(path):
       if localeConfig['file_format'] == 'chrome-json' and file.endswith('.json'):
         data = preprocessChromeLocale(path, metadata, False)
         newName = file
       elif localeConfig['file_format'] == 'chrome-json':
         fileHandle = codecs.open(path, 'rb', encoding='utf-8')
         data = json.dumps({file: {'message': fileHandle.read()}})
@@ skipping 11 matching lines @@
     )
 
 def getTranslations(localeConfig, projectName, key):
   result = urllib2.urlopen('http://api.crowdin.net/api/project/%s/export?key=%s' % (projectName, key)).read()
   if result.find('<success') < 0:
     raise Exception('Server indicated that the operation was not successful\n' + result)
 
   result = urllib2.urlopen('http://api.crowdin.net/api/project/%s/download/all.zip?key=%s' % (projectName, key)).read()
   zip = ZipFile(StringIO(result))
   dirs = {}
+
+  normalizedDefaultLocale = localeConfig['default_locale']
+  if localeConfig['name_format'] == 'ISO-15897':
+    normalizedDefaultLocale = normalizedDefaultLocale.replace('_', '-')
+  normalizedDefaultLocale = mapLocale(localeConfig['name_format'],
+                                      normalizedDefaultLocale)
+
   for info in zip.infolist():
     if not info.filename.endswith('.json'):
       continue
 
     dir, file = os.path.split(info.filename)
-    if not re.match(r'^[\w\-]+$', dir) or dir == localeConfig['default_locale']:
+    if not re.match(r'^[\w\-]+$', dir) or dir == normalizedDefaultLocale:
       continue
     if localeConfig['file_format'] == 'chrome-json' and file.count('.') == 1:
       origFile = file
     else:
       origFile = re.sub(r'\.json$', '', file)
     if (localeConfig['file_format'] == 'gecko-dtd' and
         not origFile.endswith('.dtd') and
         not origFile.endswith('.properties')):
       continue
 
@@ skipping 32 matching lines @@
 
   # Remove any extra files
   for dir, files in dirs.iteritems():
     baseDir = os.path.join(localeConfig['base_path'], dir)
     if not os.path.exists(baseDir):
       continue
     for file in os.listdir(baseDir):
       path = os.path.join(baseDir, file)
       if os.path.isfile(path) and (file.endswith('.json') or file.endswith('.properties') or file.endswith('.dtd')) and not file in files:
         os.remove(path)