Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Use reps as name for reps field

Roland Geiderba21da339f3d
diff --git a/wger/manager/models.py b/wger/manager/models.py
index 18e7f3508..168fe6e1b 100644
--- a/wger/manager/models.py
+++ b/wger/manager/models.py
@@ -764,7 +764,7 @@ class Setting(models.Model):
"""
reps = models.IntegerField(validators=[MinValueValidator(0), MaxValueValidator(600)],
- verbose_name=_('Amount'))
+ verbose_name=_('Reps'))
"""
Amount of repetitions, minutes, etc. for a set.
diff --git a/wger/manager/templates/set/formset.html b/wger/manager/templates/set/formset.html
index 3c5a7ada9..b3bf7273d 100644
--- a/wger/manager/templates/set/formset.html
+++ b/wger/manager/templates/set/formset.html
@@ -7,7 +7,7 @@
{{ formset.management_form }}
<div class="row">
- <div class="col-2">{% trans "Amount" %}</div>
+ <div class="col-2">{% trans "Reps" %}</div>
<div class="col-3">{% trans "Unit" %}</div>
<div class="col-2">{% trans "Weight" %}</div>
<div class="col-3">{% trans "Unit" %}</div>
diff --git a/wger/settings_global.py b/wger/settings_global.py
index 8d3a1fca9..bcf5941cc 100644
--- a/wger/settings_global.py
+++ b/wger/settings_global.py
@@ -216,6 +216,9 @@ LOCALE_PATHS = (
os.path.join(SITE_ROOT, 'locale'),
)
+# Primary keys are AutoFields
+DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'
+
#
# Logging