Issue 5815 - Fixed Crowdin upload with non-ASCII characters

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 326 matching lines @@
     params = urllib.urlencode([('languages[]', locale) for locale in locales])
 
     crowdin_request(projectName, 'edit-project', key, post_data=params)
 
 
 def crowdin_prepare_upload(files):
     """Create a post body and matching headers, which Crowdin can handle."""
     boundary = '----------ThIs_Is_tHe_bouNdaRY_$'
     body = ''
     for name, data in files:
-        mimetype = mimetypes.guess_type(name)[0]
         body += (
             '--{boundary}\r\n'
             'Content-Disposition: form-data; name="files[{name}]"; '
             'filename="{name}"\r\n'
             'Content-Type: {mimetype}; charset=utf-8\r\n'
             'Content-Transfer-Encoding: binary\r\n'
             '\r\n{data}\r\n'
             '--{boundary}--\r\n'
-        ).format(boundary=boundary, name=name, data=data, mimetype=mimetype)
+        ).format(boundary=boundary,
+                 name=name,
+                 data=data.encode('utf-8'),
+                 mimetype=mimetypes.guess_type(name)[0])
 
-    body = body.encode('utf-8')
     return (
         StringIO(body),
         {
             'Content-Type': ('multipart/form-data; boundary=' + boundary),
             'Content-Length': len(body)
         },
     )
 
 
 def updateTranslationMaster(localeConfig, metadata, dir, projectName, key):
@@ skipping 135 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)