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 378 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']:

[Wladimir Palant, 2016/02/12 19:05:44]

This check won't work correctly for Chrome, we will be comparing 'en-US' to
'en_US' here. We should compare to mapLocale(localeConfig['name_format'],
localeConfig['default_locale']) instead.

[kzar, 2016/02/12 19:40:26]

Good point but I think we also need to replace the underscores. Done.

+    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)