Merge pull request #1327 from gethinode/develop

Fix alias when using preferred language

assets/js/critical/languageSelector.js

@@ -35,7 +35,15 @@
     const storedLanguage = getLanguage()
     const languageItems = document.querySelectorAll('#language-selector .dropdown-item')
 
-    if (languageItems.length > 0) {
+    const link = document.querySelector("link[rel='canonical']")
+    let alias = ''
+    if (link !== null) {
+      alias = link.getAttribute('href')
+    }
+    
+    if (alias !== '') {
+      window.location.href = alias
+    } else if (languageItems.length > 0) {
       // Redirect if the stored language differs from the active language
       if ((storedLanguage) && (document.documentElement.lang !== storedLanguage)) {
         languageItems.forEach(item => {

layouts/partials/assets/breadcrumb.html

@@ -23,10 +23,12 @@
                 {{- $title := .LinkTitle -}}
                 {{- if .IsHome }}{{ $title = T "home" }}{{ end -}} 
                 {{- $address := or .RelPermalink .Params.Redirect -}}
-                {{ if $address }}
-                    <li class="breadcrumb-item"><a href="{{ $address }}">{{ $title }}</a></li>
-                {{ else }}
-                    <li class="breadcrumb-item">{{ $title }}</li>
+                {{ if $title }}
+                    {{ if $address }}
+                        <li class="breadcrumb-item"><a href="{{ $address }}">{{ $title }}</a></li>
+                    {{ else }}
+                        <li class="breadcrumb-item">{{ $title }}</li>
+                    {{ end }}
                 {{ end }}
             {{- end -}}
             <li class="breadcrumb-item active" aria-current="page">{{ $page.LinkTitle }}</li>

layouts/partials/assets/card.html

@@ -178,7 +178,8 @@
             {{- if $thumbnail -}}
                 <div class="{{ $col1 }}">
                     {{ $fullHeight := "card-img-h100" }}
-                    {{ if eq (lower (path.Ext $thumbnail)) ".svg" }}{{ $fullHeight = "" }}{{ end }}
+                    {{ $rounding := "rounded-start" }}
+                    {{ if eq (lower (path.Ext $thumbnail)) ".svg" }}{{ $fullHeight = "" }}{{ $rounding = "" }}{{ end }}
                     {{- partial $hook (dict 
                         "url" $thumbnail
                         "ratio" (or $ratio "1x1")
@@ -186,7 +187,7 @@
                         "sizes" $sizes
                         "anchor" $anchor
                         "wrapper" "h-100 card-img-wrap d-flex align-items-center"
-                        "class" (printf "rounded-start card-img-bg %s" $fullHeight)
+                        "class" (printf "card-img-bg %s %s" $rounding $fullHeight)
                         "title" $title
                         "loading" $loading
                     ) -}}

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@gethinode/hinode",
-  "version": "0.27.14",
+  "version": "0.27.17",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@gethinode/hinode",
-      "version": "0.27.14",
+      "version": "0.27.17",
       "license": "MIT",
       "dependencies": {
         "@fullhuman/postcss-purgecss": "^7.0.2",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gethinode/hinode",
-  "version": "0.27.14",
+  "version": "0.27.17",
   "description": "Hinode is a clean documentation and blog theme for Hugo, an open-source static site generator",
   "keywords": [
     "hugo",