From 3f5dced32f8d6a0383379faabb6c507b67923170 Mon Sep 17 00:00:00 2001
From: Michal Pasierbski <michal.pasierbski@ef.com>
Date: Sun, 24 May 2020 18:07:02 +0200
Subject: [PATCH] Add multilingual support

---
 layouts/_default/terms.html           | 2 +-
 layouts/partials/articleInfoFull.html | 4 ++--
 layouts/partials/header.html          | 4 ++--
 layouts/partials/pagination.html      | 4 ++--
 layouts/taxonomy/category.html        | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/layouts/_default/terms.html b/layouts/_default/terms.html
index 6f2a611..d4e745e 100644
--- a/layouts/_default/terms.html
+++ b/layouts/_default/terms.html
@@ -8,7 +8,7 @@
     <ul class="terms">
         {{ range $key, $value := .Data.Terms }}
         <li>
-            <a href="{{ (print $.Data.Plural "/" (lower $key)) | absURL }}">
+            <a href="{{ (print $.Data.Plural "/" (lower $key)) | absLangURL }}">
             {{ $key }}
             </a>
             ({{ len $value }})
diff --git a/layouts/partials/articleInfoFull.html b/layouts/partials/articleInfoFull.html
index d3bf36f..46bc32f 100644
--- a/layouts/partials/articleInfoFull.html
+++ b/layouts/partials/articleInfoFull.html
@@ -6,14 +6,14 @@
         {{ if .Params.categories }}
             <ul class="article-categories">
                 {{ range .Params.categories }}
-                    <li><a href="{{ "categories/" | absURL }}{{ . }}">{{ . }}</a></li>
+                    <li><a href="{{ "categories/" | absLangURL }}{{ . }}">{{ . }}</a></li>
                 {{ end }}
             </ul>
             {{ end }}
             {{ if .Params.tags }}
                 <ul class="article-tags">
                     {{ range .Params.tags }}
-                        <li><a href="{{ "tags/" | absURL }}{{ . | urlize}}">#{{ . }}</a></li>
+                        <li><a href="{{ "tags/" | absLangURL }}{{ . | urlize }}">#{{ . }}</a></li>
                     {{ end }}
                 </ul>
         {{ end }}
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index b3506ec..5b84493 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -1,9 +1,9 @@
 <h1 class="site-header">
-    <a href="{{ .Site.BaseURL }}">{{ .Site.Title }}</a>
+    <a href="{{ .Site.BaseURL | relLangURL }}">{{ .Site.Title }}</a>
 </h1>
 <nav>
     {{ $currentPage := . }}
     {{ range .Site.Menus.main }}
-    <a class="{{if or ($currentPage.IsMenuCurrent "main" .) ($currentPage.HasMenuCurrent "main" .) }} active{{end}}" href="{{ .URL }}" title="{{ .Title }}">{{ .Name }}</a>
+    <a class="{{if or ($currentPage.IsMenuCurrent "main" .) ($currentPage.HasMenuCurrent "main" .) }} active{{end}}" href="{{ .URL | absLangURL }}" title="{{ .Title }}">{{ .Name }}</a>
     {{ end }}
 </nav>
diff --git a/layouts/partials/pagination.html b/layouts/partials/pagination.html
index 2aed60a..e6bf28b 100644
--- a/layouts/partials/pagination.html
+++ b/layouts/partials/pagination.html
@@ -7,13 +7,13 @@
                 {{ if eq .Paginator.PageNumber 2 }}
                 <a href="{{ .Site.BaseURL }}{{ .Site.LanguagePrefix }}">{{ $toNewPostsMessage }}</a>
                 {{ else }}
-                <a href="{{ .Paginator.Prev.URL | absURL }}">{{ $toNewPostsMessage }}</a>
+                <a href="{{ .Paginator.Prev.URL | absLangURL }}">{{ $toNewPostsMessage }}</a>
                 {{ end }}
             {{ end }}
         </div>
         <div class="right pagination-item {{ if not .Paginator.HasNext }}disabled{{ end }}">
             {{ if .Paginator.HasNext }}
-            <a href="{{ .Paginator.Next.URL | absURL }}">{{ $toOldPostsMessage }}</a>
+            <a href="{{ .Paginator.Next.URL | absLangURL }}">{{ $toOldPostsMessage }}</a>
             {{ end }}
         </div>
     </div>
diff --git a/layouts/taxonomy/category.html b/layouts/taxonomy/category.html
index 5ca1371..a7b869f 100644
--- a/layouts/taxonomy/category.html
+++ b/layouts/taxonomy/category.html
@@ -2,7 +2,7 @@
 
     <h1>{{ i18n "category" | humanize }}: {{ .Title }}</h1>
     <div class="article-info">
-        <a href="{{ "categories/" | absURL }}">{{ i18n "toAllCategories" | humanize }}</a>
+        <a href="{{ "categories/" | absLangURL }}">{{ i18n "toAllCategories" | humanize }}</a>
     </div>
     {{ range .Data.Pages }}
     <article class="post-list">