Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Properly handle the (wrong) case where there are multiple translations for an exercise

Roland Geiderb443fcbe09e1
diff --git a/wger/exercises/models/base.py b/wger/exercises/models/base.py
index 5b941a6e8..f73808819 100644
--- a/wger/exercises/models/base.py
+++ b/wger/exercises/models/base.py
@@ -165,7 +165,9 @@ class ExerciseBase(AbstractLicenseModel, AbstractHistoryMixin, models.Model):
except Exercise.DoesNotExist:
try:
exercise = self.exercises.get(language__short_name=ENGLISH_SHORT_NAME)
- except:
+ except Exercise.DoesNotExist:
exercise = self.exercises.first()
+ except Exercise.MultipleObjectsReturned:
+ exercise = self.exercises.filter(language__short_name=language).first()
return exercise