Self hosted FLOSS fitness/workout, nutrition and weight tracker
Merge branch 'master' into feature/update-bootstrap-5.2
Roland Geider7b35ed000aa5
diff --cc wger/core/templates/template.htmlindex f970cdbab,bd59e86b0..845ee4aa9--- a/wger/core/templates/template.html+++ b/wger/core/templates/template.html@@@ -185,33 -186,31 +185,29 @@@{# Render the links to the other languages #}{# #}<div class="col-md-4">- {% if not is_api_path %}- {# Don't show language switcher in the generated API views #}- <div class="btn-group float-sm-right" role="group">- <div class="btn-group" role="group">- <button id="btnGroupLanguages2" type="button"- class="btn btn-link text-muted small dropdown-toggle btn-sm"- data-toggle="dropdown">+ {% if not is_api_path %} {# Don't show language switcher in the generated API views #}+ <div class="dropup float-end">+ <button+ class="btn btn-light dropdown-toggle"+ type="button"+ data-bs-toggle="dropdown"+ aria-expanded="false">- {% with 'images/icons/flag-'|add:language.short_name|add:'.svg' as flagname %}- <img src="{% static flagname %}"- width="18"- alt="{% translate language.full_name %}"- title="{% translate language.full_name %}">- {{ language.full_name }} <span class="caret"></span>- {% endwith %}+ <span class="{% fa_class 'globe' %}"></span>- {% translate i18n_language.name %}++ {% translate i18n_language.name %}+ <span class="caret"></span>- </button>- <div class="dropdown-menu dropdown-menu-right"- aria-labelledby="btnGroupLanguages">- {% for language in languages %}- {% language_select language %}- {% endfor %}- <div class="dropdown-divider"></div>- <a href="https://hosted.weblate.org/engage/wger/"- class="dropdown-item"- target="_blank">- <span class="{% fa_class 'plus' %}"></span>- {% translate "Translate" %}- </a>- </div>+ </button>++ <div class="dropdown-menu" aria-labelledby="btnGroupLanguages">+ {% for language in languages %}+ {% language_select language %}+ {% endfor %}+ <div class="dropdown-divider"></div>+ <a href="https://hosted.weblate.org/engage/wger/" class="dropdown-item" target="_blank">+ <span class="{% fa_class 'plus' %}"></span>+ {% translate "Translate" %}+ </a></div>+</div>{% endif %}</div>diff --cc wger/core/templatetags/wger_extras.pyindex 571d993ad,f940213b3..9ba26de1b--- a/wger/core/templatetags/wger_extras.py+++ b/wger/core/templatetags/wger_extras.py@@@ -34,7 -34,9 +34,8 @@@ from wger.utils.constants importPAGINATION_MAX_TOTAL_PAGES,PAGINATION_PAGES_AROUND_CURRENT,)+ from wger.utils.language import get_language_data-register = template.Library()