Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Don't use an em dash to separate the sets

Roland Geider03c8dc36b6f8
diff --git a/wger/manager/dataclasses.py b/wger/manager/dataclasses.py
index 49eb1921c..26d07fcf5 100644
--- a/wger/manager/dataclasses.py
+++ b/wger/manager/dataclasses.py
@@ -76,7 +76,7 @@ class SetConfigData:
if self.sets and self.sets > 1:
sets = normalize_decimal(Decimal(self.sets))
- out.append(f'{sets} {_("Sets")} –')
+ out.append(f'{sets} {_("Sets")},')
if self.reps:
reps = round_value(self.reps, self.reps_rounding)
diff --git a/wger/manager/tests/test_set_config_data.py b/wger/manager/tests/test_set_config_data.py
index 26bc01433..a3fce4b91 100644
--- a/wger/manager/tests/test_set_config_data.py
+++ b/wger/manager/tests/test_set_config_data.py
@@ -60,7 +60,7 @@ class SetConfigDataTestCase(WgerTestCase):
def test_sets(self):
self.config.sets = 3
- self.assertEqual(self.config.text_repr, '3 Sets – 4 × 20 kg @ 3 RiR')
+ self.assertEqual(self.config.text_repr, '3 Sets, 4 × 20 kg @ 3 RiR')
def test_weight_rounding(self):
self.config.weight = 22.499
@@ -92,3 +92,8 @@ class SetConfigDataTestCase(WgerTestCase):
def test_weight_range(self):
self.config.max_weight = 30
self.assertEqual(self.config.text_repr, '4 × 20-30 kg @ 3 RiR')
+
+ def test_sets_and_weight_range(self):
+ self.config.sets = 3
+ self.config.max_weight = 30
+ self.assertEqual(self.config.text_repr, '3 Sets, 4 × 20-30 kg @ 3 RiR')