Self hosted FLOSS fitness/workout, nutrition and weight tracker
Fix bug in language selection for exercise search
Roland Geider5bafdc7efb42
diff --git a/wger/core/static/js/workout-manager.js b/wger/core/static/js/workout-manager.jsindex bd61d852f..384d7f8ad 100644--- a/wger/core/static/js/workout-manager.js+++ b/wger/core/static/js/workout-manager.js@@ -509,7 +509,7 @@ function init_edit_set() {// Initialise the autocompleter (our widget, defined above)if (jQuery.ui) {$("#exercise-search").catcomplete({- source: '/api/v2/exercise/search/',+ source: '/api/v2/exercise/search/?language=' + get_current_language(),minLength: 2,select: function (event, ui) {diff --git a/wger/exercises/api/views.py b/wger/exercises/api/views.pyindex 8e8982234..552953f31 100644--- a/wger/exercises/api/views.py+++ b/wger/exercises/api/views.py@@ -89,7 +89,7 @@ def search(request):if not q:return Response(results)- languages = load_item_languages(LanguageConfig.SHOW_ITEM_EXERCISES)+ languages = load_item_languages(LanguageConfig.SHOW_ITEM_EXERCISES, language_code=request.GET.get('language', None))exercises = (Exercise.objects.filter(name__icontains=q).filter(language__in=languages).filter(status=Exercise.STATUS_ACCEPTED)diff --git a/wger/software/templates/changelog.html b/wger/software/templates/changelog.htmlindex da2680d64..f4ca2cc7b 100644--- a/wger/software/templates/changelog.html+++ b/wger/software/templates/changelog.html@@ -17,6 +17,7 @@<li>Other improvements and bugfixes<a href="https://github.com/rolandgeider/wger/issues/258">#258</a>+ <a href="https://github.com/rolandgeider/wger/issues/257">#257</a></li></ul>diff --git a/wger/utils/language.py b/wger/utils/language.pyindex f790bc7ad..5a1f13efe 100644--- a/wger/utils/language.py+++ b/wger/utils/language.py@@ -31,7 +31,7 @@ logger = logging.getLogger(__name__)# ************************-def load_language():+def load_language(language_code=None):'''Returns the currently used language, e.g. to load appropriate exercises'''@@ -39,7 +39,10 @@ def load_language():# TODO: perhaps store a language preference in the user's profile?# Read the first part of a composite language, e.g. 'de-at'- used_language = translation.get_language().split('-')[0]+ if language_code is None:+ used_language = translation.get_language().split('-')[0]+ else:+ used_language = language_codelanguage = cache.get(cache_mapper.get_language_key(used_language))if language:@@ -55,12 +58,12 @@ def load_language():return language-def load_item_languages(item):+def load_item_languages(item, language_code=None):'''Returns the languages for a data type (exercises, ingredients)'''- language = load_language()+ language = load_language(language_code)languages = cache.get(cache_mapper.get_language_config_key(language, item))# Load the configurations we are interested in and return the languages