Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

feat: use name_en

Tom Bowyer0a5aba68b7a2
diff --git a/wger/exercises/api/views.py b/wger/exercises/api/views.py
index ca6bc27ae..11fdace16 100644
--- a/wger/exercises/api/views.py
+++ b/wger/exercises/api/views.py
@@ -364,4 +364,4 @@ class MuscleViewSet(viewsets.ReadOnlyModelViewSet):
queryset = Muscle.objects.all()
serializer_class = MuscleSerializer
ordering_fields = '__all__'
- filterset_fields = ('name', 'is_front')
+ filterset_fields = ('name', 'is_front', 'name_en')
diff --git a/wger/exercises/fixtures/test-exercises.json b/wger/exercises/fixtures/test-exercises.json
index 31d74eb42..112b96f3c 100644
--- a/wger/exercises/fixtures/test-exercises.json
+++ b/wger/exercises/fixtures/test-exercises.json
@@ -4,7 +4,8 @@
"model": "exercises.muscle",
"fields": {
"is_front": true,
- "name": "Anterior testoid"
+ "name": "Anterior testoid",
+ "name_en": "Testoulders"
}
},
{
@@ -12,7 +13,8 @@
"model": "exercises.muscle",
"fields": {
"is_front": false,
- "name": "Biceps testii"
+ "name": "Biceps testii",
+ "name_en": "Testceps"
}
},
{
@@ -28,7 +30,8 @@
"model": "exercises.muscle",
"fields": {
"is_front": true,
- "name": "Bigus Pectoralis"
+ "name": "Bigus Pectoralis",
+ "name_en": "Testch"
}
},
{
@@ -44,7 +47,8 @@
"model": "exercises.muscle",
"fields": {
"is_front": true,
- "name": "Gluteus jucicus"
+ "name": "Gluteus jucicus",
+ "name_en": "Test jucicus"
}
},
{
diff --git a/wger/exercises/management/commands/sync-exercises.py b/wger/exercises/management/commands/sync-exercises.py
index c453f876c..15385438b 100644
--- a/wger/exercises/management/commands/sync-exercises.py
+++ b/wger/exercises/management/commands/sync-exercises.py
@@ -166,16 +166,18 @@ class Command(BaseCommand):
muscle_id = muscle_data['id']
muscle_name = muscle_data['name']
muscle_is_front = muscle_data['is_front']
+ muscle_name_en = muscle_data['name_en']
muscle_url_main = muscle_data['image_url_main']
muscle_url_secondary = muscle_data['image_url_secondary']
try:
muscle = Muscle.objects.get(pk=muscle_id)
muscle.name = muscle_name
- muscle_is_front = muscle_is_front
+ muscle.is_front = muscle_is_front
+ muscle.name_en = muscle_name_en
muscle.save()
except Muscle.DoesNotExist:
- muscle = Muscle(id=muscle_id, name=muscle_name, is_front=muscle_is_front)
+ muscle = Muscle(id=muscle_id, name=muscle_name, is_front=muscle_is_front, name_en=muscle_name_en)
muscle.save()
self.stdout.write(
self.style.WARNING(
diff --git a/wger/exercises/migrations/0017_muscle_name_en.py b/wger/exercises/migrations/0017_muscle_name_en.py
index 3997bfd05..cf427dbb6 100644
--- a/wger/exercises/migrations/0017_muscle_name_en.py
+++ b/wger/exercises/migrations/0017_muscle_name_en.py
@@ -13,6 +13,7 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='muscle',
name='name_en',
- field=models.CharField(default='', max_length=50),
+ field=models.CharField(default='', help_text='A more basic name for the muscle',
+ max_length=50, verbose_name='Alternative name'),
),
]
diff --git a/wger/exercises/models/muscle.py b/wger/exercises/models/muscle.py
index e65152077..76e678a32 100644
--- a/wger/exercises/models/muscle.py
+++ b/wger/exercises/models/muscle.py
@@ -44,6 +44,8 @@ class Muscle(models.Model):
name_en = models.CharField(
max_length=50,
default='',
+ verbose_name=_('Alternative name'),
+ help_text=_('A more basic name for the muscle'),
)
# Metaclass to set some other properties
diff --git a/wger/exercises/templates/muscles/overview.html b/wger/exercises/templates/muscles/overview.html
index 1ea88988e..415abf9e0 100644
--- a/wger/exercises/templates/muscles/overview.html
+++ b/wger/exercises/templates/muscles/overview.html
@@ -37,7 +37,11 @@
data-name="{{muscle.name}}"
itemscope itemtype="http://schema.org/Muscle"
>
- {{ muscle }}
+ {% if muscle.name_en %}
+ {{ muscle }} ({{muscle.name_en}})
+ {% else %}
+ {{ muscle }}
+ {% endif %}
</button>
</div>
<div class="collapse" id="collapse-{{muscle.pk}}" data-parent="#muscleAccordion">
diff --git a/wger/exercises/tests/test_muscles.py b/wger/exercises/tests/test_muscles.py
index b6a43d96a..4171ab599 100644
--- a/wger/exercises/tests/test_muscles.py
+++ b/wger/exercises/tests/test_muscles.py
@@ -97,7 +97,7 @@ class AddMuscleTestCase(WgerAddTestCase):
object_class = Muscle
url = 'exercise:muscle:add'
- data = {'name': 'A new muscle', 'is_front': True}
+ data = {'name': 'A new muscle', 'is_front': True, 'name_en': 'Other muscle'}
class EditMuscleTestCase(WgerEditTestCase):
@@ -108,7 +108,7 @@ class EditMuscleTestCase(WgerEditTestCase):
object_class = Muscle
url = 'exercise:muscle:edit'
pk = 1
- data = {'name': 'The new name', 'is_front': True}
+ data = {'name': 'The new name', 'is_front': True, 'name_en': 'Edited muscle'}
class DeleteMuscleTestCase(WgerDeleteTestCase):
diff --git a/wger/exercises/views/muscles.py b/wger/exercises/views/muscles.py
index 01163f034..db818820c 100644
--- a/wger/exercises/views/muscles.py
+++ b/wger/exercises/views/muscles.py
@@ -81,7 +81,7 @@ class MuscleAddView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin,
"""
model = Muscle
- fields = ['name', 'is_front']
+ fields = ['name', 'is_front', 'name_en']
success_url = reverse_lazy('exercise:muscle:admin-list')
title = gettext_lazy('Add muscle')
permission_required = 'exercises.add_muscle'
@@ -93,7 +93,7 @@ class MuscleUpdateView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixi
"""
model = Muscle
- fields = ['name', 'is_front']
+ fields = ['name', 'is_front', 'name_en']
success_url = reverse_lazy('exercise:muscle:admin-list')
permission_required = 'exercises.change_muscle'
@@ -112,7 +112,7 @@ class MuscleDeleteView(WgerDeleteMixin, LoginRequiredMixin, PermissionRequiredMi
"""
model = Muscle
- fields = ('name', 'is_front')
+ fields = ('name', 'is_front', 'name_en')
success_url = reverse_lazy('exercise:muscle:admin-list')
permission_required = 'exercises.delete_muscle'
messages = gettext_lazy('Successfully deleted')