Merge remote-tracking branch 'origin/master'

weblate/lang/models.py

@@ -127,7 +127,7 @@ DEFAULT_LANGS = (
 )
 
 class LanguageManager(models.Manager):
-    def get_or_create(self, code):
+    def auto_get_or_create(self, code):
         '''
         Gets matching language for code (the code does not have to be exactly
         same, cs_CZ is same as cs-CZ) or creates new one.

weblate/trans/managers.py

@@ -74,7 +74,7 @@ class TranslationManager(models.Manager):
         '''
         Parses translation meta info and creates/updates translation object.
         '''
-        lang = Language.objects.get_or_create(code = code)
+        lang = Language.objects.auto_get_or_create(code = code)
         translation, created = self.get_or_create(
             language = lang,
             language_code = code,