salt/mandelstudio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "fix: robust language switcher links"

Browse Source 
This reverts commit d4410b1f68.
This commit is contained in:
Mandel Olaiya
2026-05-02 21:33:03 +02:00
parent d4410b1f68
commit b73ae5ea32
2 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mandelstudio/templates/oxyan/headers/partials/carbasa-user-bar.html
View File

@@ -1,7 +1,9 @@
{% load i18n localized_navigation %} {% load i18n localized_navigation %}
<div class="header-right"> <div class="header-right">
{% get_current_language as current_language %}
{% get_available_languages as available_languages %} {% get_available_languages as available_languages %}
{% get_language_info_list for available_languages as languages %}
{% request_language_options as language_options %} {% request_language_options as language_options %}
<div class="dropdown language-dropdown me-2"> <div class="dropdown language-dropdown me-2">
@@ -27,12 +29,16 @@
</button> </button>
<ul class="dropdown-menu dropdown-menu-end" aria-labelledby="header-language-switcher"> <ul class="dropdown-menu dropdown-menu-end" aria-labelledby="header-language-switcher">
{% for option in language_options %} {% for option in language_options %}
{% for language in languages %}
{% if language.code == option.code %}
<li> <li>
<a class="dropdown-item d-flex align-items-center gap-2" href="{{ option.url }}"> <a class="dropdown-item d-flex align-items-center gap-2" href="{{ option.url }}">
{% include "oxyan/partials/flags/"|add:option.code|add:".svg" %} {% include "oxyan/partials/flags/"|add:language.code|add:".svg" %}
<span>{{ option.label|title }}</span> <span>{{ language.name_local|title }}</span>
</a> </a>
</li> </li>
{% endif %}
{% endfor %}
{% endfor %} {% endfor %}
</ul> </ul>
</div> </div>

3
mandelstudio/templatetags/localized_navigation.py
View File

@@ -141,13 +141,10 @@ def page_language_options(page):
@register.simple_tag(takes_context=True) @register.simple_tag(takes_context=True)
def request_language_options(context): def request_language_options(context):
try:
page = context.get("page") or context.get("self") page = context.get("page") or context.get("self")
if page is None: if page is None:
page = _resolve_page_from_request(context.get("request")) page = _resolve_page_from_request(context.get("request"))
return page_language_options(page) return page_language_options(page)
except Exception:
return page_language_options(None)
@register.simple_tag(takes_context=True) @register.simple_tag(takes_context=True)