From 49fc7e43434671c5001f15c0a94b5ab6330519b1 Mon Sep 17 00:00:00 2001
From: Fritz Michael Gschwantner <fmg@inspiredminds.at>
Date: Fri, 15 Nov 2019 09:44:52 +0000
Subject: [PATCH 1/2] fix and simplify language menu

---
 layouts/partials/menu.html | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/layouts/partials/menu.html b/layouts/partials/menu.html
index 967fc6c0061..b8b059ca110 100644
--- a/layouts/partials/menu.html
+++ b/layouts/partials/menu.html
@@ -49,21 +49,13 @@ <h3>{{ if not $disableShortcutsTitle}}{{ T "Shortcuts-Title"}}{{ end }}</h3>
             <i class="fas fa-language fa-fw"></i>
           <div class="select-style">
             <select id="select-language" onchange="location = this.value;">
-          {{ $siteLanguages := .Site.Languages}}
-          {{ $pageLang := .Page.Lang}}
-          {{ range .Page.AllTranslations }}
-              {{ $translation := .}}
-              {{ range $siteLanguages }}
-                  {{ if eq $translation.Lang .Lang }}
-                    {{ $selected := false }}
-                    {{ if eq $pageLang .Lang}}
-                      <option id="{{ $translation.Language }}" value="{{ $translation.Permalink }}" selected>{{ .LanguageName }}</option>
-                    {{ else }}
-                      <option id="{{ $translation.Language }}" value="{{ $translation.Permalink }}">{{ .LanguageName }}</option>
-                    {{ end }}
-                  {{ end }}
+              {{ range .AllTranslations }}
+                {{ if eq .Page.Lang .Lang }}
+                  <option id="{{ .Language }}" value="{{ .Permalink }}" selected>{{ .Language.LanguageName }}</option>
+                {{ else }}
+                  <option id="{{ .Language }}" value="{{ .Permalink }}">{{ .Language.LanguageName }}</option>
+                {{ end }}
               {{ end }}
-          {{ end }}
         </select>
         <svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
           width="255px" height="255px" viewBox="0 0 255 255" style="enable-background:new 0 0 255 255;" xml:space="preserve">

From 56578baa23697d8abdaf7bf9b4f947dd8b01eb3c Mon Sep 17 00:00:00 2001
From: Fritz Michael Gschwantner <fmg@inspiredminds.at>
Date: Fri, 15 Nov 2019 10:56:16 +0100
Subject: [PATCH 2/2] fix current language detection

---
 layouts/partials/menu.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/layouts/partials/menu.html b/layouts/partials/menu.html
index b8b059ca110..5f21ac1bc01 100644
--- a/layouts/partials/menu.html
+++ b/layouts/partials/menu.html
@@ -49,8 +49,9 @@ <h3>{{ if not $disableShortcutsTitle}}{{ T "Shortcuts-Title"}}{{ end }}</h3>
             <i class="fas fa-language fa-fw"></i>
           <div class="select-style">
             <select id="select-language" onchange="location = this.value;">
+              {{ $pageLang := .Page.Lang }}
               {{ range .AllTranslations }}
-                {{ if eq .Page.Lang .Lang }}
+                {{ if eq $pageLang .Lang }}
                   <option id="{{ .Language }}" value="{{ .Permalink }}" selected>{{ .Language.LanguageName }}</option>
                 {{ else }}
                   <option id="{{ .Language }}" value="{{ .Permalink }}">{{ .Language.LanguageName }}</option>