Merge remote-tracking branch 'origin/master'

weblate/lang/migrations/0004_fill_in_plural_type.py

@@ -29,10 +29,18 @@ class Migration(DataMigration):
     def forwards(self, orm):
         "Write your forwards methods here."
         for lang in orm.Language.objects.all():
+            # Cleanup plural equation
+            if lang.pluralequation[-1] == ';':
+                lang.pluralequation = lang.pluralequation[:-1]
+            if lang.pluralequation[0] == '(' and lang.pluralequation[-1] == ')':
+                lang.pluralequation = lang.pluralequation[1:-1]
+
+            # Add plural type
             lang.plural_type = get_plural_type(
                 lang.code,
                 lang.pluralequation
             )
+
             lang.save()
 
     def backwards(self, orm):

weblate/lang/models.py

@@ -210,6 +210,8 @@ def get_plural_type(code, pluralequation):
     Gets correct plural type for language.
     '''
     # Remove not needed parenthesis
+    if pluralequation[-1] == ';':
+        pluralequation = pluralequation[:-1]
     if pluralequation[0] == '(' and pluralequation[-1] == ')':
         pluralequation = pluralequation[1:-1]