jutty/blog
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix slashes and home URL resolution in language toggle

Browse source
This commit is contained in:
jultty 2024-08-20 04:32:32 -03:00
commit 134d4131db
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
templates/base.html
View file

@ -49,7 +49,7 @@
{% else %} {% else %}
{%- set locale_all_content = "All content" %} {%- set locale_all_content = "All content" %}
{%- set locale_language_name = "English" %} {%- set locale_language_name = "English" %}
{%- endif %} {%- endif -%}
<link rel="alternate" type="application/rss+xml" title="{{ locale_all_content }}: {{ locale_language_name }} (RSS)" href="{{ get_url(path="rss.xml", lang=lang, trailing_slash=false) }}"> <link rel="alternate" type="application/rss+xml" title="{{ locale_all_content }}: {{ locale_language_name }} (RSS)" href="{{ get_url(path="rss.xml", lang=lang, trailing_slash=false) }}">
<link rel="alternate" type="application/rss+xml" title="{{ locale_all_content }}: {{ locale_language_name }} (Atom)" href="{{ get_url(path="atom.xml", lang=lang, trailing_slash=false) }}"> <link rel="alternate" type="application/rss+xml" title="{{ locale_all_content }}: {{ locale_language_name }} (Atom)" href="{{ get_url(path="atom.xml", lang=lang, trailing_slash=false) }}">
<link rel="alternate" type="application/rss+xml" title="Posts: {{ locale_language_name }} (RSS)" href="{{ get_url(path="posts/rss.xml", lang=lang, trailing_slash=false) }}"> <link rel="alternate" type="application/rss+xml" title="Posts: {{ locale_language_name }} (RSS)" href="{{ get_url(path="posts/rss.xml", lang=lang, trailing_slash=false) }}">
@ -81,13 +81,14 @@
</ul> </ul>
</nav> </nav>
{% if current_path and translation_count > 1 %} {% if current_path and translation_count > 1 %}
{%- set english_path = current_path | regex_replace(pattern="^/pt", rep="") %} {%- set slashless_current_path = current_path | regex_replace(pattern="^\/", rep="") %}
{%- set english_path = current_path | regex_replace(pattern="pt\/", rep="") %}
<div id="language-selector"> <div id="language-selector">
<figure id="language-icon"> <figure id="language-icon">
<img src="{{ get_url(path="assets/img/icons/language.svg") }}" <img src="{{ get_url(path="assets/img/icons/language.svg") }}"
alt="{% if lang == "pt" %}Ícone de idioma{% else %}Language icon{% endif %}"/> alt="{% if lang == "pt" %}Ícone de idioma{% else %}Language icon{% endif %}"/>
</figure> </figure>
{%- if lang == "pt" %}<a href="{{ get_url(path=english_path) }}">EN</a>{% else %}<a href="{{ get_url(path=current_path, lang="pt") }}">PT</a> {%- if lang == "pt" %}<a href="{{ get_url(path=english_path) }}">EN</a>{% else %}<a href="{{ get_url(path=slashless_current_path, lang="pt") }}">PT</a>
{%- endif %} {%- endif %}
</div> </div>
{%- endif %} {%- endif %}