From a43bb4ea6d306d28201fab47aa33b020c80dee9d Mon Sep 17 00:00:00 2001
From: Joe Mooring <joe.mooring@veriphor.com>
Date: Mon, 3 Jun 2024 19:52:21 +0200
Subject: [PATCH] Improve language switcher to work reliably in single- and
 multi-host settings

	Thanks a lot @jmooring
	https://discourse.gohugo.io/t/multihost-trouble/50103/10

Authored-by: Joe Mooring <joe.mooring@veriphor.com>
Signed-off-by: Daniel Holbach <daniel.holbach@gmail.com>
---
 layouts/index.html | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/layouts/index.html b/layouts/index.html
index a1f63d1..1f3b1ac 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -38,23 +38,16 @@
 	{{ $num_lang := len $languages }}
 	{{ if and (gt $num_lang 1) $.Site.Params.language_menu }}
 	<div id="site-languages" class="inner">
-	{{ range $languages }}
-	    {{ $lang_title := . | strings.ToUpper }}
-	    {{ if .LanguageName }}{{ $lang_title = .LanguageName }}{{ end }}
-
-	    {{ if eq .Lang $.Lang }}
-		{{ if $.Site.Params.show_current_lang }}
-		<span class='btn-lang active'>{{ $lang_title }}</span>
-		{{ end }}
-		{{ continue }}
-	    {{ end }}
-
-        {{ if hugo.IsMultihost }}
-	    <a class='btn-lang' href='{{ urls.AbsLangURL "" }}'>{{ $lang_title }}</a>
-        {{ else }}
-	    <a class='btn-lang' href='{{ . | relURL }}'>{{ $lang_title }}</a>
+    {{ range site.Sites }}
+      {{ $lang_title := or .Language.LanguageName (.Language.Lang | strings.ToUpper) }}
+      {{ if eq . $.Site }}
+        {{ if $.Site.Params.show_current_lang }}
+          <span class='btn-lang active'>{{ $lang_title }}</span>
         {{ end }}
-	{{ end }}
+      {{ else }}
+        <a class='btn-lang' href='{{ .Home.Permalink }}'>{{ $lang_title }}</a>
+      {{ end }}
+    {{ end }}
 	</div>
 	{{ end }}