Issue 5939 - Download translations to correct folder

localeTools.py

 # 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
 import os
 import sys
 import codecs
 import json
 import urlparse
@@ skipping 251 matching lines @@
         if not re.match(r'^[\w\-]+$', dir) or dir == normalizedDefaultLocale:
             continue
         if file.count('.') == 1:
             origFile = file
         else:
             origFile = os.path.splitext(file)[0]
 
         for key, value in CROWDIN_LANG_MAPPING.iteritems():
             if value == dir:
                 dir = key
+        dir = dir.replace('-', '_')
 
         data = zip.open(info.filename).read()
         if data == '[]':
             continue
 
         if not dir in dirs:
             dirs[dir] = set()
         dirs[dir].add(origFile)
 
         path = os.path.join(localeConfig['base_path'], dir, origFile)
@@ skipping 11 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)
             valid_extension = file.endswith('.json')
             if os.path.isfile(path) and valid_extension and not file in files:
                 os.remove(path)