Improve multi-language support

getzola · Jul 3, 2022 · 43d8c6a · 43d8c6a
1 parent 8c4c185
commit 43d8c6a
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 11 deletions.
diff --git a/templates/index.html b/templates/index.html
@@ -24,18 +24,32 @@
     </head>
 
     <body class="hack dark main container">
+        {% set lang_base_url = get_url(path="", lang=lang) %}
         {% block content %}
             {% block header %}
-                {% if config.extra.after_dark_menu %}
+                {% if config.extra.after_dark_menu or config.extra.after_dark_langs %}
                     <header>
                         <nav itemscope itemtype="http://schema.org/SiteNavigationElement">
-                        {% for item in config.extra.after_dark_menu %}
-                            <a itemprop="url"
-                               class="{% if item.url | replace(from="$BASE_URL", to=config.base_url) == current_url %}active{% endif %}"
-                               href="{{ item.url | safe | replace(from="$BASE_URL", to=config.base_url) }}">
-                                <span itemprop="name">{{ item.name }}
-                                </span></a>
-                        {% endfor %}
+                            {% if config.extra.after_dark_langs %}
+                                <div style="float: right">
+                                {% for item in config.extra.after_dark_langs %}
+                                    <a itemprop="url"
+                                       class="navbar {% if item.url | replace(from="$BASE_URL", to=config.base_url) | replace(from="$LANG_BASE_URL", to=lang_base_url) == current_url %}active{% endif %}"
+                                       href="{{ item.url | safe | replace(from="$BASE_URL", to=config.base_url) | replace(from="$LANG_BASE_URL", to=lang_base_url) }}">
+                                        <span itemprop="name">{% if item.trans_key %}{{ trans(key=item.trans_key, lang=lang) }}{% else %}{{ item.name }}{% endif %}</span></a>
+                                {% endfor %}
+                                </div>
+                            {% endif %}
+                            {% if config.extra.after_dark_menu %}
+                                <div>
+                                {% for item in config.extra.after_dark_menu %}
+                                    <a itemprop="url"
+                                       class="navbar {% if item.url | replace(from="$BASE_URL", to=config.base_url) | replace(from="$LANG_BASE_URL", to=lang_base_url) == current_url %}active{% endif %}"
+                                       href="{{ item.url | safe | replace(from="$BASE_URL", to=config.base_url) | replace(from="$LANG_BASE_URL", to=lang_base_url) }}">
+                                        <span itemprop="name">{% if item.trans_key %}{{ trans(key=item.trans_key, lang=lang) }}{% else %}{{ item.name }}{% endif %}</span></a>
+                                {% endfor %}
+                                </div>
+                            {% endif %}
                         </nav>
                     </header>
                 {% endif %}

diff --git a/templates/page.html b/templates/page.html
@@ -26,13 +26,13 @@ <h1 itemprop="headline">{{ page.title }}</h1>
                 {% endif %}
                 {% if page.taxonomies.categories %}
                     {% set category = page.taxonomies.categories[0] %}
-                    in <a href="{{ get_taxonomy_url(kind="categories", name=category) | safe }}">{{ category }}</a>
+                    in <a href="{{ get_taxonomy_url(kind="categories", name=category, lang=page.lang) | safe }}">{{ category }}</a>
                 {% endif %}
                 {% if page.taxonomies.tags %}
                     {% if page.taxonomies.categories %}and{% endif %}
                     tagged
                     {% for tag in page.taxonomies.tags %}
-                        <a href="{{ get_taxonomy_url(kind="tags", name=tag) | safe }}">{{ tag }}</a>
+                        <a href="{{ get_taxonomy_url(kind="tags", name=tag, lang=page.lang) | safe }}">{{ tag }}</a>
                         {% if page.taxonomies.tags | length > 1 %}
                             {% if loop.index != page.taxonomies.tags | length %}
                                 {% if loop.index == page.taxonomies.tags | length - 1 %}

diff --git a/templates/tags/list.html b/templates/tags/list.html
@@ -5,7 +5,7 @@
         {{ super() }}
     {% endblock header %}
 
-    <h1>Tags</h1>
+    <h1>{% if config.extra.after_dark_multilingual %}{{ trans(key="tags", lang=lang) }}{% else %}Tags{% endif %}</h1>
 
     {% if terms %}
         <ul>