Self hosted FLOSS fitness/workout, nutrition and weight tracker
Merge branch 'master' into feature/ingredient-images
Roland Geider2d4838fd4c7d
diff --cc .gitignoreindex 9286e0098,c5123877e..798a1778d--- a/.gitignore+++ b/.gitignore@@@ -67,8 -67,9 +67,12 @@@ node_modulevenvvenv-wget- # Dummy file for translations- /wger/i18n.tpl-# Will need to copy this file to react repo though++# Dummy translation files to copy to react or flutter repo+ /wger/i18n.tsx--# Will need to copy these files to the flutter repo+ /wger/i18n.dart+ /wger/app_en.arb++++++# Local images folder+/mediadiff --cc AUTHORS.rstindex 6c3e01084,6b39ee2be..86e505f44--- a/AUTHORS.rst+++ b/AUTHORS.rst@@@ -64,7 -64,7 +64,8 @@@ Developer* absolutely-not-bot - https://github.com/absolutely-not-bot* Jaspreet Dhillon - https://github.com/jaspreetsd902* Sofiko Alaverdashvili - https://github.com/sophiamartelli+* Oebele Lijzenga - https://github.com/olijzenga+ * Tom Bowyer - https://github.com/ImTheTomTranslators-----------diff --cc wger/core/management/commands/extract-i18n.pyindex e09f21a3a,b4f9e4c7c..cd6d6ef53--- a/wger/core/management/commands/extract-i18n.py+++ b/wger/core/management/commands/extract-i18n.py@@@ -45,9 -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 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()]- # + [i for i in Muscle.objects.all()] \-- ## Django - write to .tpl filewith open('wger/i18n.tpl', 'w') as f:out = '{% load i18n %}\n'diff --cc wger/settings_global.pyindex 2d0ccca07,71a33bf42..f4c78315e--- a/wger/settings_global.py+++ b/wger/settings_global.py@@@ -425,15 -424,11 +425,14 @@@ USER_AGENTS_CACHE = 'default# Consult docs/settings.rst for more information#WGER_SETTINGS = {- 'USE_RECAPTCHA': False,- 'REMOVE_WHITESPACE': False,- 'ALLOW_REGISTRATION': True,'ALLOW_GUEST_USERS': True,+ 'ALLOW_REGISTRATION': True,'ALLOW_UPLOAD_VIDEOS': False,'EMAIL_FROM': 'wger Workout Manager <[email protected]>',+ 'EXERCISE_CACHE_TTL': 3600,'TWITTER': False,- 'DOWNLOAD_FROM_OFF': False+ 'USE_RECAPTCHA': False}++# Whether the application is being run regularly or during tests+TESTING = len(sys.argv) > 1 and sys.argv[1] == 'test'