Self hosted FLOSS fitness/workout, nutrition and weight tracker
Merge branch 'master' into feature/exercise-crowdsourcing
Roland Geideref3d42d8dc8b
diff --cc requirements_dev.txtindex 241893312,7a125d641..8721a1cbd--- a/requirements_dev.txt+++ b/requirements_dev.txt@@@ -11,11 -11,8 +11,11 @@@ wheel==0.37.# for ingredient import script from OFFpymongo==4.1.1+# for ingredient import script from OFF+pymongo==3.12.1+# Development packages- coverage==6.3.2+ coverage==6.3.3django-debug-toolbar==3.4.0tblib==1.7.0isort==5.10.1diff --cc wger/core/management/commands/extract-i18n.pyindex 8ca4c7f51,0904b005d..fd2fedc2c--- a/wger/core/management/commands/extract-i18n.py+++ b/wger/core/management/commands/extract-i18n.py@@@ -50,11 -50,12 +50,9 @@@ class Command(BaseCommand)# Collect all translatable itemsdata = [i for i in ExerciseCategory.objects.all()] \+ [i for i in Equipment.objects.all()] \+ + [i.name_en for i in Muscle.objects.all() if i.name_en] \+ [i for i in RepetitionUnit.objects.all()]-- # + [i for i in Muscle.objects.all()] \---- ## Django - write to .tpl filewith open('wger/i18n.tpl', 'w') as f:out = '{% load i18n %}\n'