Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Code review fixes

Tom Bowyer5fe107506c40
diff --git a/.gitignore b/.gitignore
index 595a743c2..6db0887cc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -69,3 +69,6 @@ venv-wget
# Dummy file for translations
/wger/i18n.tpl
+
+# Will need to copy this file to react repo though
+/wger/i18n.tsx
diff --git a/wger/core/management/commands/extract-i18n.py b/wger/core/management/commands/extract-i18n.py
index e09f21a3a..049264cea 100644
--- a/wger/core/management/commands/extract-i18n.py
+++ b/wger/core/management/commands/extract-i18n.py
@@ -46,6 +46,7 @@ class Command(BaseCommand):
data = [i for i in ExerciseCategory.objects.all()] \
+ [i for i in Equipment.objects.all()] \
+ [i for i in Muscle.objects.all()] \
+ + [i.name_en for i in Muscle.objects.all() if i.name_en] \
+ [i for i in RepetitionUnit.objects.all()]
# Django - write to .tpl file
diff --git a/wger/exercises/migrations/0017_muscle_name_en.py b/wger/exercises/migrations/0017_muscle_name_en.py
index cf427dbb6..d0db7f28c 100644
--- a/wger/exercises/migrations/0017_muscle_name_en.py
+++ b/wger/exercises/migrations/0017_muscle_name_en.py
@@ -1,7 +1,32 @@
# Generated by Django 3.2.13 on 2022-05-10 10:07
+# Edited by Tom on 2022-05-12 18:30 to include name_en values
from django.db import migrations, models
+# Will also set the name_en value in the migration
+muscle_names = [
+ (1, 'Biceps'),
+ (2, 'Shoulders'),
+ (4, 'Chest'),
+ (5, 'Triceps'),
+ (6, 'Abs'),
+ (7, 'Calves'),
+ (8, 'Glutes'),
+ (10, 'Quads'),
+ (11, 'Hamstrings'),
+ (12, 'Lats'),
+ (16, 'Lower back'),
+]
+
+def set_names(apps, schema_editor):
+ Muscle = apps.get_model('exercises', 'Muscle')
+ for mapping in muscle_names:
+ try:
+ m = Muscle.objects.get(pk=mapping[0])
+ m.name_en = mapping[1]
+ m.save()
+ except Muscle.DoesNotExist:
+ pass
class Migration(migrations.Migration):
@@ -16,4 +41,5 @@ class Migration(migrations.Migration):
field=models.CharField(default='', help_text='A more basic name for the muscle',
max_length=50, verbose_name='Alternative name'),
),
+ migrations.RunPython(set_names),
]
diff --git a/wger/exercises/templates/muscles/overview.html b/wger/exercises/templates/muscles/overview.html
index 415abf9e0..b8f7af8ce 100644
--- a/wger/exercises/templates/muscles/overview.html
+++ b/wger/exercises/templates/muscles/overview.html
@@ -38,7 +38,7 @@
itemscope itemtype="http://schema.org/Muscle"
>
{% if muscle.name_en %}
- {{ muscle }} ({{muscle.name_en}})
+ {{ muscle }} ({% translate muscle.name_en %})
{% else %}
{{ muscle }}
{% endif %}
diff --git a/wger/exercises/tests/test_muscles.py b/wger/exercises/tests/test_muscles.py
index 4171ab599..2b1630124 100644
--- a/wger/exercises/tests/test_muscles.py
+++ b/wger/exercises/tests/test_muscles.py
@@ -152,7 +152,7 @@ class MuscleApiTestCase(api_base_test.ApiBaseResourceTestCase):
pk = 1
resource = Muscle
private_resource = False
- data = {'name': 'The name', 'is_front': True}
+ data = {'name': 'The name', 'is_front': True, 'name_en': 'name en'}
def test_get_detail(self):
super().test_get_detail()
diff --git a/wger/locale/el/LC_MESSAGES/django.mo b/wger/locale/el/LC_MESSAGES/django.mo
index a40be5e22..588448f2f 100644
Binary files a/wger/locale/el/LC_MESSAGES/django.mo and b/wger/locale/el/LC_MESSAGES/django.mo differ