Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Correctly set language in template

Roland Geidera28968081b63
diff --git a/wger/core/static/js/wger-core.js b/wger/core/static/js/wger-core.js
index 3d5d44be3..b7efff73e 100644
--- a/wger/core/static/js/wger-core.js
+++ b/wger/core/static/js/wger-core.js
@@ -82,7 +82,7 @@ function wgerSetupSortable() {
$.ajax({
url: '/api/v2/set/' + setId + '/',
type: 'PATCH',
- data: { order: eventIndex + 1 }
+ data: {order: eventIndex + 1}
});
}
});
@@ -109,9 +109,9 @@ function setProfileField(field, newValue) {
var dataDict = {};
dataDict[field] = newValue;
$.post({
- url: '/api/v2/userprofile/',
- data: dataDict
- });
+ url: '/api/v2/userprofile/',
+ data: dataDict
+ });
}
/*
@@ -447,10 +447,22 @@ function initRemoveExerciseFormset() {
});
}
+function getSearchLanguages() {
+ let search_languages = getCurrentLanguage();
+ let search_english = $('#id_english_results')[0].checked;
+ if (search_english === true) {
+ search_languages = search_languages + ',' + 'en';
+ }
+
+ return search_languages;
+}
+
function wgerInitEditSet() {
// Initialise the autocompleter (our widget, defined above)
$('#exercise-search').autocomplete({
- serviceUrl: '/api/v2/exercise/search/?language=' + getCurrentLanguage(),
+ serviceUrl: function () {
+ return '/api/v2/exercise/search/?language=' + getSearchLanguages()
+ },
showNoSuggestionNotice: true,
groupBy: 'category',
paramName: 'term',
diff --git a/wger/manager/forms.py b/wger/manager/forms.py
index cf1a03d24..3513102b7 100644
--- a/wger/manager/forms.py
+++ b/wger/manager/forms.py
@@ -69,7 +69,6 @@ from wger.utils.widgets import (
class WorkoutForm(ModelForm):
-
class Meta:
model = Workout
fields = (
@@ -79,7 +78,6 @@ class WorkoutForm(ModelForm):
class WorkoutMakeTemplateForm(ModelForm):
-
class Meta:
model = Workout
fields = (
@@ -102,10 +100,9 @@ class WorkoutCopyForm(Form):
class DayForm(ModelForm):
-
class Meta:
model = Day
- exclude = ('training', )
+ exclude = ('training',)
widgets = {'day': TranslatedSelectMultiple()}
def __init__(self, *args, **kwargs):
@@ -127,7 +124,6 @@ class OrderedModelMultipleChoiceField(ModelMultipleChoiceField):
class SetForm(ModelForm):
-
exercises = OrderedModelMultipleChoiceField(
queryset=ExerciseBase.objects.all(),
label=_('Exercises'),
@@ -140,13 +136,18 @@ class SetForm(ModelForm):
)
)
+ english_results = BooleanField(
+ label=gettext_lazy("Also search for names in English"),
+ initial=True,
+ required=False,
+ )
+
class Meta:
model = Set
exclude = ('order', 'exerciseday')
class SettingForm(ModelForm):
-
class Meta:
model = Setting
exclude = ('set', 'exercise', 'order', 'name')
@@ -193,7 +194,7 @@ class WorkoutLogForm(ModelForm):
class Meta:
model = WorkoutLog
- exclude = ('workout', )
+ exclude = ('workout',)
class WorkoutLogFormHelper(FormHelper):
diff --git a/wger/manager/templates/set/add.html b/wger/manager/templates/set/add.html
index cc515b7e7..4b2ae04e1 100644
--- a/wger/manager/templates/set/add.html
+++ b/wger/manager/templates/set/add.html
@@ -31,6 +31,7 @@ function wgerCustomPageInit()
{% csrf_token %}
{{ form.exercises|as_crispy_field }}
+ {{ form.english_results|as_crispy_field }}
{{ form.comment|as_crispy_field }}
<div class="form-group">