Utils: Make choiceval compatible with Django 3.1

WeblateOrg · Jun 15, 2020 · aa3b53d · aa3b53d
1 parent 37d86c2
commit aa3b53d
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/weblate/trans/templatetags/translations.py b/weblate/trans/templatetags/translations.py
@@ -774,7 +774,13 @@ def choiceval(boundfield):
         return gettext("enabled")
     if not hasattr(boundfield.field, "choices"):
         return value
-    choices = dict(boundfield.field.choices)
+    choices = list(boundfield.field.choices)
+    if choices and hasattr(choices[0][0], "value"):
+        # Django 3.1+ yields ModelChoiceIteratorValue
+        choices = {choice.value: value for choice, value in choices}
+    else:
+        # Django 3.0
+        choices = dict(choices)
     if isinstance(value, list):
         return ", ".join(choices.get(val, val) for val in value)
     return choices.get(value, value)