Issue 2109 - Allow for translation of app independent repositories

build.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 os, sys, re, subprocess, shutil, buildtools
 from getopt import getopt, GetoptError
 from StringIO import StringIO
 from zipfile import ZipFile
@@ skipping 218 matching lines @@
   from buildtools.packager import getDevEnvPath
   devenv_dir = getDevEnvPath(baseDir, type)
 
   shutil.rmtree(devenv_dir, ignore_errors=True)
 
   file.seek(0)
   with ZipFile(file, 'r') as zip_file:
     zip_file.extractall(devenv_dir)
 
 
-def readLocaleConfig(baseDir, type, metadata, includeIncomplete=False):
+def readLocaleConfig(baseDir, type, metadata):
   if type == 'gecko':
     import buildtools.packagerGecko as packager
-    basePath = packager.getLocalesDir(baseDir)
-    return {
-      'base_path': basePath,
+    localeDir = packager.getLocalesDir(baseDir)
+    localeConfig = {
       'name_format': 'BCP-47',
       'file_format': 'gecko-dtd',
       'target_platforms': {'gecko'},
-      'default_locale': packager.defaultLocale,
-      'locales': {locale: os.path.join(basePath, locale)
-                  for locale in packager.getLocales(baseDir, includeIncomplete)}
+      'default_locale': packager.defaultLocale
     }
-
-  if type == 'chrome' or type == 'opera':

[Wladimir Palant, 2016/02/12 17:13:04]

What about Safari?

[kzar, 2016/02/12 18:25:25]

Safari isn't a supported type for any of the translation commands.

+  elif type == 'chrome' or type == 'opera':
     import buildtools.packagerChrome as packager
-    localeDir = '_locales'
+    localeDir = os.path.join(baseDir, '_locales')
     localeConfig = {
       'name_format': 'ISO-15897',
       'file_format': 'chrome-json',
       'target_platforms': {'chrome'},
       'default_locale': packager.defaultLocale,
     }
   else:
-    localeDir = metadata.get('locales', 'base_path')
+    localeDir = os.path.join(baseDir,
+                             *metadata.get('locales', 'base_path').split('/'))
     localeConfig = {
       'name_format': metadata.get('locales', 'name_format'),
       'file_format': metadata.get('locales', 'file_format'),
       'target_platforms': set(metadata.get('locales',
                                            'target_platforms').split()),
       'default_locale': metadata.get('locales', 'default_locale')
     }
 
-  localeConfig['base_path'] = fullBasePath = os.path.join(baseDir, localeDir)
-  localeConfig['locales'] = {locale.replace('_', '-'):
-                                              os.path.join(fullBasePath, locale)

[Wladimir Palant, 2016/02/12 17:13:04]

Replacing '_' by '-' is only necessary for ISO-15897 locales. In other words,
you shouldn't do this for "non-Gecko" but rather check
localeConfig['name_format'].

[kzar, 2016/02/12 18:25:25]

Done.

-                             for locale in os.listdir(fullBasePath)}
+  localeConfig['base_path'] = localeDir
+
+  locales = [(locale, os.path.join(localeDir, locale))
+             for locale in os.listdir(localeDir)]
+  if localeConfig['name_format'] == 'ISO-15897':
+    locales = [(locale.replace('_', '-'), localePath)
+               for locale, localePath in locales]
+  localeConfig['locales'] = dict(locales)
+
   return localeConfig
 
 def setupTranslations(baseDir, scriptName, opts, args, type):
   if len(args) < 1:
     print 'Project key is required to update translation master files.'
     usage(scriptName, type, 'setuptrans')
     return
 
   key = args[0]
 
   from buildtools.packager import readMetadata
   metadata = readMetadata(baseDir, type)
 
   basename = metadata.get('general', 'basename')
-  localeConfig = readLocaleConfig(baseDir, type, metadata, True)
+  localeConfig = readLocaleConfig(baseDir, type, metadata)
 
   import buildtools.localeTools as localeTools
-  localeTools.setupTranslations(basename, localeConfig, key)
+  localeTools.setupTranslations(localeConfig, basename, key)
 
 
 def updateTranslationMaster(baseDir, scriptName, opts, args, type):
   if len(args) < 1:
     print 'Project key is required to update translation master files.'
     usage(scriptName, type, 'translate')
     return
 
   key = args[0]
 
   from buildtools.packager import readMetadata
   metadata = readMetadata(baseDir, type)
 
   basename = metadata.get('general', 'basename')
   localeConfig = readLocaleConfig(baseDir, type, metadata)
 
   defaultLocaleDir = os.path.join(localeConfig['base_path'],
                                   localeConfig['default_locale'])
 
   import buildtools.localeTools as localeTools
-  localeTools.updateTranslationMaster(metadata, defaultLocaleDir, basename,
-                                      localeConfig, key)

[Wladimir Palant, 2016/02/12 17:13:04]

With localeConfig being very central for each localeTools call I would expect
this parameter to go first (it replaces the type parameter).

[kzar, 2016/02/12 18:25:25]

Done.

+  localeTools.updateTranslationMaster(localeConfig, metadata, defaultLocaleDir,
+                                      basename, key)
 
 
 def uploadTranslations(baseDir, scriptName, opts, args, type):
   if len(args) < 1:
     print 'Project key is required to upload existing translations.'
     usage(scriptName, type, 'uploadtrans')
     return
 
   key = args[0]
 
   from buildtools.packager import readMetadata
   metadata = readMetadata(baseDir, type)
 
   basename = metadata.get('general', 'basename')
-  localeConfig = readLocaleConfig(baseDir, type, metadata, True)
+  localeConfig = readLocaleConfig(baseDir, type, metadata)
 
   import buildtools.localeTools as localeTools
   for locale, localeDir in localeConfig['locales'].iteritems():
     if locale != localeConfig['default_locale']:
-      localeTools.uploadTranslations(metadata, localeDir, locale, basename,
-                                     localeConfig, key)
+      localeTools.uploadTranslations(localeConfig, metadata, localeDir, locale,
+                                     basename, key)
 
 
 def getTranslations(baseDir, scriptName, opts, args, type):
   if len(args) < 1:
     print 'Project key is required to update translation master files.'
     usage(scriptName, type, 'translate')
     return
 
   key = args[0]
 
@@ skipping 246 matching lines @@
         if option in ('-h', '--help'):
           usage(scriptName, type, command)
           sys.exit()
       commands[command](baseDir, scriptName, opts, args, type)
     else:
       print 'Command %s is not supported for this application type' % command
       usage(scriptName, type)
   else:
     print 'Command %s is unrecognized' % command
     usage(scriptName, type)