Merge remote-tracking branch 'origin/master'

93c88995 · Michal Čihař · 6c6bbc62 · c8063380 · 93c88995
Commit 93c88995 authored Jun 28, 2012 by Michal Čihař
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 4 deletions

weblate/lang/models.py weblate/lang/models.py +1 -4

No files found.
--- a/weblate/lang/models.py
+++ b/weblate/lang/models.py
@@ -38,10 +38,7 @@ class LanguageManager(models.Manager):
        if '-' in code:
            try:
                baselang = Language.objects.get(code = code.replace('-', '_'))
-                lang.name = '%s' % (
+                lang.name = baselang.name
-                    baselang.name,
-                    code,
-                )
                lang.nplurals = baselang.nplurals
                lang.pluralequation = baselang.pluralequation
                lang.save()