fix: 语言切换时去掉next路径中的语言前缀,修复切回中文无效
This commit is contained in:
@@ -1,5 +1,6 @@
|
|||||||
from django import template
|
from django import template
|
||||||
from django.utils.translation import get_language
|
from django.utils.translation import get_language
|
||||||
|
from django.conf import settings
|
||||||
|
|
||||||
register = template.Library()
|
register = template.Library()
|
||||||
|
|
||||||
@@ -31,3 +32,26 @@ def ml(obj, field_name):
|
|||||||
{{ site_settings|ml:'site_name' }}
|
{{ site_settings|ml:'site_name' }}
|
||||||
"""
|
"""
|
||||||
return _ml_value(obj, field_name)
|
return _ml_value(obj, field_name)
|
||||||
|
|
||||||
|
|
||||||
|
@register.filter
|
||||||
|
def strip_lang_prefix(path):
|
||||||
|
"""去掉 URL 路径中的语言前缀。
|
||||||
|
|
||||||
|
用于语言切换按钮的 next 字段:传递不带语言前缀的路径,
|
||||||
|
让 Django 的 translate_url 只需加前缀,避免 prefix_default_language=False
|
||||||
|
时去前缀失败的问题。
|
||||||
|
|
||||||
|
用法:
|
||||||
|
<input type="hidden" name="next" value="{{ request.get_full_path|strip_lang_prefix }}">
|
||||||
|
"""
|
||||||
|
if not path:
|
||||||
|
return '/'
|
||||||
|
# 去掉开头的斜杠后按 / 分割
|
||||||
|
parts = path.lstrip('/').split('/', 1)
|
||||||
|
# 检查第一段是否是已配置的语言代码
|
||||||
|
configured_langs = {code for code, _ in settings.LANGUAGES}
|
||||||
|
if parts[0] in configured_langs:
|
||||||
|
# 去掉语言前缀,返回剩余路径
|
||||||
|
return '/' + parts[1] if len(parts) > 1 else '/'
|
||||||
|
return path
|
||||||
|
|||||||
@@ -31,7 +31,7 @@
|
|||||||
</ul>
|
</ul>
|
||||||
<form action="{% url 'set_language' %}" method="post" class="lang-switcher ms-lg-3 mt-2 mt-lg-0">
|
<form action="{% url 'set_language' %}" method="post" class="lang-switcher ms-lg-3 mt-2 mt-lg-0">
|
||||||
{% csrf_token %}
|
{% csrf_token %}
|
||||||
<input type="hidden" name="next" value="{{ request.get_full_path|force_escape }}">
|
<input type="hidden" name="next" value="{{ request.get_full_path|strip_lang_prefix|force_escape }}">
|
||||||
<button type="submit" name="language" value="zh-hans" class="btn btn-sm {% if LANGUAGE_CODE == 'zh-hans' %}btn-primary{% else %}btn-outline-primary{% endif %}">中文</button>
|
<button type="submit" name="language" value="zh-hans" class="btn btn-sm {% if LANGUAGE_CODE == 'zh-hans' %}btn-primary{% else %}btn-outline-primary{% endif %}">中文</button>
|
||||||
<button type="submit" name="language" value="en" class="btn btn-sm {% if LANGUAGE_CODE == 'en' %}btn-primary{% else %}btn-outline-primary{% endif %}">EN</button>
|
<button type="submit" name="language" value="en" class="btn btn-sm {% if LANGUAGE_CODE == 'en' %}btn-primary{% else %}btn-outline-primary{% endif %}">EN</button>
|
||||||
</form>
|
</form>
|
||||||
|
|||||||
Reference in New Issue
Block a user