Merge remote-tracking branch 'origin/master'

weblate/lang/models.py

@@ -115,6 +115,8 @@ class LanguageManager(models.Manager):
         It also handles Android special naming of regional locales like pt-rBR
         '''
 
+        code = code.replace(' ', '_')
+
         # First try getting langauge as is
         ret = self.try_get(code=code)
         if ret is not None:

weblate/trans/migrations/0027_auto_20150401_1030.py

 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations
 
 
 class Migration(migrations.Migration):