From d348ee0560daa8f80abfeeacfe4885ce5d6dbece Mon Sep 17 00:00:00 2001
From: erciccione <erciccione@protonmail.com>
Date: Sat, 27 Mar 2021 13:10:36 +0100
Subject: [PATCH] blog: fix language switching to english when selecting a
 category

---
 _layouts/blog_by_tag.html | 20 ++++++++++----------
 blog/index.html           | 22 +++++++++++-----------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/_layouts/blog_by_tag.html b/_layouts/blog_by_tag.html
index 6c6a2844..9601a071 100644
--- a/_layouts/blog_by_tag.html
+++ b/_layouts/blog_by_tag.html
@@ -13,11 +13,11 @@ layout: custom
   <!-- Category selector: desktop -->
     <div class="container full desktop-only">
         <div class="info-block blog-nav row">
-            <div class="col"><a href="{{ site.baseurl_root }}/blog/">{% t blog.allposts %}</a></div>
-            <div class="col {% if filename == 'urgent' %}checked{% endif %}"><a href="{{ site.baseurl_root }}/blog/tags/urgent.html">{% t blog.urgent %}</a></div>
-            <div class="col {% if filename == 'releases' %}checked{% endif %}"><a href="{{ site.baseurl_root }}/blog/tags/releases.html">{% t blog.releases %}</a></div>
-            <div class="col {% if filename == 'community' %}checked{% endif %}"><a href="{{ site.baseurl_root }}/blog/tags/community.html">{% t blog.community %}</a></div>
-            <div class="col {% if filename == 'dev diaries' %}checked{% endif %}"><a href="{{ site.baseurl_root }}/blog/tags/dev%20diaries.html">{% t blog.meetinglogs %}</a></div>
+            <div class="col"><a href="{{ site.baseurl }}/blog/">{% t blog.allposts %}</a></div>
+            <div class="col {% if filename == 'urgent' %}checked{% endif %}"><a href="{{ site.baseurl }}/blog/tags/urgent.html">{% t blog.urgent %}</a></div>
+            <div class="col {% if filename == 'releases' %}checked{% endif %}"><a href="{{ site.baseurl }}/blog/tags/releases.html">{% t blog.releases %}</a></div>
+            <div class="col {% if filename == 'community' %}checked{% endif %}"><a href="{{ site.baseurl }}/blog/tags/community.html">{% t blog.community %}</a></div>
+            <div class="col {% if filename == 'dev diaries' %}checked{% endif %}"><a href="{{ site.baseurl }}/blog/tags/dev%20diaries.html">{% t blog.meetinglogs %}</a></div>
         </div>
     </div>
   <!-- End category selector: desktop -->
@@ -28,11 +28,11 @@ layout: custom
               <input id="filter" type="checkbox" name="category-filter"/>
               <label for="filter">{% t blog.filter %}</label>
               <ul id="menu">
-                  <li><a href="{{ site.baseurl_root }}/blog/">{% t blog.allposts %}</a></li>
-                  <li><a href="{{ site.baseurl_root }}/blog/tags/urgent.html">{% t blog.urgent %}</a></li>
-                  <li><a href="{{ site.baseurl_root }}/blog/tags/releases.html">{% t blog.releases %}</a></li>
-                  <li><a href="{{ site.baseurl_root }}/blog/tags/community.html">{% t blog.community %}</a></li>
-                  <li><a href="{{ site.baseurl_root }}/blog/tags/dev%20diaries.html">{% t blog.meetinglogs %}</a></li>
+                  <li><a href="{{ site.baseurl }}/blog/">{% t blog.allposts %}</a></li>
+                  <li><a href="{{ site.baseurl }}/blog/tags/urgent.html">{% t blog.urgent %}</a></li>
+                  <li><a href="{{ site.baseurl }}/blog/tags/releases.html">{% t blog.releases %}</a></li>
+                  <li><a href="{{ site.baseurl }}/blog/tags/community.html">{% t blog.community %}</a></li>
+                  <li><a href="{{ site.baseurl }}/blog/tags/dev%20diaries.html">{% t blog.meetinglogs %}</a></li>
               </ul>
           </div>
       </div>
diff --git a/blog/index.html b/blog/index.html
index 03eae706..8d46de9a 100644
--- a/blog/index.html
+++ b/blog/index.html
@@ -7,11 +7,11 @@ title: titles.blogbytag
   <!-- Category selector: desktop -->
   <div class="container full">
     <div class="info-block blog-nav row">
-      <div class="col {% if page.name == 'index.html' %}checked{% endif %}"><a href="{{ site.baseurl_root }}/blog/">{% t blog.allposts %}</a></div>
-      <div class="col"><a href="{{ site.baseurl_root }}/blog/tags/urgent.html">{% t blog.urgent %}</a></div>
-      <div class="col"><a href="{{ site.baseurl_root }}/blog/tags/releases.html">{% t blog.releases %}</a></div>
-      <div class="col"><a href="{{ site.baseurl_root }}/blog/tags/community.html">{% t blog.community %}</a></div>
-      <div class="col"><a href="{{ site.baseurl_root }}/blog/tags/dev%20diaries.html">{% t blog.meetinglogs %}</a></div>
+      <div class="col {% if page.name == 'index.html' %}checked{% endif %}"><a href="{{ site.baseurl }}/blog/">{% t blog.allposts %}</a></div>
+      <div class="col"><a href="{{ site.baseurl }}/blog/tags/urgent.html">{% t blog.urgent %}</a></div>
+      <div class="col"><a href="{{ site.baseurl }}/blog/tags/releases.html">{% t blog.releases %}</a></div>
+      <div class="col"><a href="{{ site.baseurl }}/blog/tags/community.html">{% t blog.community %}</a></div>
+      <div class="col"><a href="{{ site.baseurl }}/blog/tags/dev%20diaries.html">{% t blog.meetinglogs %}</a></div>
     </div>
   </div>
   <!-- End category selector: desktop -->
@@ -22,11 +22,11 @@ title: titles.blogbytag
         <input id="filter" type="checkbox" name="category-filter"/>
         <label for="filter">{% t blog.filter %}</label>
         <ul id="menu">
-          <li><a href="{{ site.baseurl_root }}/blog/">{% t blog.allposts %}</a></li>
-          <li><a href="{{ site.baseurl_root }}/blog/tags/urgent.html">{% t blog.urgent %}</a></li>
-          <li><a href="{{ site.baseurl_root }}/blog/tags/releases.html">{% t blog.releases %}</a></li>
-          <li><a href="{{ site.baseurl_root }}/blog/tags/community.html">{% t blog.community %}</a></li>
-          <li><a href="{{ site.baseurl_root }}/blog/tags/dev%20diaries.html">{% t blog.meetinglogs %}</a></li>
+          <li><a href="{{ site.baseurl }}/blog/">{% t blog.allposts %}</a></li>
+          <li><a href="{{ site.baseurl }}/blog/tags/urgent.html">{% t blog.urgent %}</a></li>
+          <li><a href="{{ site.baseurl }}/blog/tags/releases.html">{% t blog.releases %}</a></li>
+          <li><a href="{{ site.baseurl }}/blog/tags/community.html">{% t blog.community %}</a></li>
+          <li><a href="{{ site.baseurl }}/blog/tags/dev%20diaries.html">{% t blog.meetinglogs %}</a></li>
         </ul>
       </div>
     </div>
@@ -78,7 +78,7 @@ title: titles.blogbytag
     {% if page == paginator.page %}
       <em>{{ page }}</em>
     {% elsif page == 1 %}
-      <a href="{{ site.baseurl_root }}/blog">{{ page }}</a>
+      <a href="{{ site.baseurl }}/blog">{{ page }}</a>
     {% else %}
       <a href="{{ site.paginate_path | prepend: '/' | replace: '//', '/' | replace: ':num', page }}">{{ page }}</a>
     {% endif %}