From f04cf21e515eea4bee1eb1340b1646c8c87551b0 Mon Sep 17 00:00:00 2001
From: Raoul <raoul@ccczh.ch>
Date: Sun, 29 Apr 2018 18:03:46 +0200
Subject: [PATCH] Sidebar cleanup

---
 config.toml                                   | 21 ++++---------------
 .../layouts/partials/site-sidebar.de.html     | 19 +++++++----------
 .../layouts/partials/site-sidebar.en.html     | 15 ++++++-------
 .../layouts/partials/site-sidebar.fr.html     | 15 ++++++-------
 .../layouts/partials/site-sidebar.it.html     | 19 +++++++----------
 5 files changed, 32 insertions(+), 57 deletions(-)

diff --git a/config.toml b/config.toml
index 47f181a..f92205b 100644
--- a/config.toml
+++ b/config.toml
@@ -10,29 +10,16 @@ DefaultContentLanguageInSubdir = true
 [Languages]
 [Languages.de]
   weight = 1
-  languageNames = {de = "Deutsch",
-                   fr = "Französisch",
-                   it = "Italienisch",
-                   en = "Englisch"}
+  LanguageName = "Deutsch"
 
 [Languages.fr]
   weight = 2
-  languageNames = {de = "Allemand",
-                   fr = "Français",
-                   it = "Italien",
-                   en = "Anglais"}
+  LanguageName = "Français"
 
 [Languages.it]
   weight = 3
-  languageNames = {de = "Tedesco",
-                   fr = "Francese ",
-                   it = "Italiano",
-                   en = "Inglese"}
-
+  LanguageName = "Italiano"
 
 [Languages.en]
   weight = 4
-  languageNames = {de = "German",
-                   fr = "French",
-                   it = "Italian",
-                   en = "English"}
+  LanguageName = "English"
diff --git a/themes/cosin-theme/layouts/partials/site-sidebar.de.html b/themes/cosin-theme/layouts/partials/site-sidebar.de.html
index e9e98d5..56c12df 100644
--- a/themes/cosin-theme/layouts/partials/site-sidebar.de.html
+++ b/themes/cosin-theme/layouts/partials/site-sidebar.de.html
@@ -4,8 +4,8 @@
 <h3>{{ .title }} {{ .date_year }}</h3>
 
 <p>
-  Chaos Singularity (CoSin) ist ein jährlicher Event des Schweizer Chaos. Der
-  Inhalt erstreckt sich über Technik und Politik zu Kunst und Kultur.
+  Chaos Singularity (CoSin) ist ein jährlicher Event des Schweizer Chaos.
+  Der Inhalt erstreckt sich über Technik und Politik zu Kunst und Kultur.
 </p>
 
 <p>
@@ -39,9 +39,7 @@
 
 
 {{ if .schedule_available }}
-<p>
-  <strong>Fahrplan:</strong>
-</p>
+<p><strong>Fahrplan:</strong></p>
 <ul>
   {{ range $index, $element := .schedule_urls }}
     <li><a href="{{ $element | safeURL }}">Tag {{ add $index 1 }}</a></li>
@@ -50,17 +48,16 @@
 {{ end }}
 
 
-<p><strong>IRC:</strong> <a href="{{ .irc_server | safeURL }}{{ .irc_channel }}">{{ .irc_channel }}</a>
-</p>
-
+<p><strong>IRC:</strong> <a href="{{ .irc_server | safeURL }}{{ .irc_channel }}">{{ .irc_channel }}</a></p>
 {{ end }}
 
+
 <p>
   <strong>Sprache:</strong>
   {{ if .IsTranslated }}
-  {{ range .Translations }}
-  <a href="{{ .Permalink }}">{{ index .Site.Params.languageNames .Lang }}</a>
-  {{ end }}
+    {{ range .Translations }}
+      <a href="{{ .Permalink }}">{{ .Site.Language.LanguageName }}</a>
+    {{ end }}
   {{ end }}
 </p>
 
diff --git a/themes/cosin-theme/layouts/partials/site-sidebar.en.html b/themes/cosin-theme/layouts/partials/site-sidebar.en.html
index fe2038d..fc94470 100644
--- a/themes/cosin-theme/layouts/partials/site-sidebar.en.html
+++ b/themes/cosin-theme/layouts/partials/site-sidebar.en.html
@@ -39,9 +39,7 @@
 
 
 {{ if .schedule_available }}
-<p>
-  <strong>Schedule:</strong>
-</p>
+<p><strong>Schedule:</strong></p>
 <ul>
   {{ range $index, $element := .schedule_urls }}
     <li><a href="{{ $element | safeURL }}">Day {{ add $index 1 }}</a></li>
@@ -50,17 +48,16 @@
 {{ end }}
 
 
-<p><strong>IRC:</strong> <a href="{{ .irc_server | safeURL }}{{ .irc_channel }}">{{ .irc_channel }}</a>
-</p>
-
+<p><strong>IRC:</strong> <a href="{{ .irc_server | safeURL }}{{ .irc_channel }}">{{ .irc_channel }}</a></p>
 {{ end }}
 
+
 <p>
   <strong>Language:</strong>
   {{ if .IsTranslated }}
-  {{ range .Translations }}
-  <a href="{{ .Permalink }}">{{ index .Site.Params.languageNames .Lang }}</a>
-  {{ end }}
+    {{ range .Translations }}
+      <a href="{{ .Permalink }}">{{ .Site.Language.LanguageName }}</a>
+    {{ end }}
   {{ end }}
 </p>
 
diff --git a/themes/cosin-theme/layouts/partials/site-sidebar.fr.html b/themes/cosin-theme/layouts/partials/site-sidebar.fr.html
index 3d1f8ef..3e2243e 100644
--- a/themes/cosin-theme/layouts/partials/site-sidebar.fr.html
+++ b/themes/cosin-theme/layouts/partials/site-sidebar.fr.html
@@ -39,9 +39,7 @@
 
 
 {{ if .schedule_available }}
-<p>
-  <strong>Programme:</strong>
-</p>
+<p><strong>Programme:</strong></p>
 <ul>
   {{ range $index, $element := .schedule_urls }}
     <li><a href="{{ $element | safeURL }}">Jour {{ add $index 1 }}</a></li>
@@ -50,17 +48,16 @@
 {{ end }}
 
 
-<p><strong>IRC:</strong> <a href="{{ .irc_server | safeURL }}{{ .irc_channel }}">{{ .irc_channel }}</a>
-</p>
-
+<p><strong>IRC:</strong> <a href="{{ .irc_server | safeURL }}{{ .irc_channel }}">{{ .irc_channel }}</a></p>
 {{ end }}
 
+
 <p>
   <strong>Langage:</strong>
   {{ if .IsTranslated }}
-  {{ range .Translations }}
-  <a href="{{ .Permalink }}">{{ index .Site.Params.languageNames .Lang }}</a>
-  {{ end }}
+    {{ range .Translations }}
+      <a href="{{ .Permalink }}">{{ .Site.Language.LanguageName }}</a>
+    {{ end }}
   {{ end }}
 </p>
 
diff --git a/themes/cosin-theme/layouts/partials/site-sidebar.it.html b/themes/cosin-theme/layouts/partials/site-sidebar.it.html
index 4b3d7dc..ea9a09f 100644
--- a/themes/cosin-theme/layouts/partials/site-sidebar.it.html
+++ b/themes/cosin-theme/layouts/partials/site-sidebar.it.html
@@ -4,8 +4,8 @@
 <h3>{{ .title }} {{ .date_year }}</h3>
 
 <p>
-  Chaos Singularity (CoSin) è l'evento annuale del Caos Svizzero. I contenuti si
-  articolano tra tecnica, politica, arte e cultura.
+  Chaos Singularity (CoSin) è l'evento annuale del Caos Svizzero.
+  I contenuti si articolano tra tecnica, politica, arte e cultura.
 </p>
 
 <p>
@@ -39,9 +39,7 @@
 
 
 {{ if .schedule_available }}
-<p>
-  <strong>Tabella di marcia:</strong>
-</p>
+<p><strong>Tabella di marcia:</strong></p>
 <ul>
   {{ range $index, $element := .schedule_urls }}
     <li><a href="{{ $element | safeURL }}">Giorno {{ add $index 1 }}</a></li>
@@ -50,17 +48,16 @@
 {{ end }}
 
 
-<p><strong>IRC:</strong> <a href="{{ .irc_server | safeURL }}{{ .irc_channel }}">{{ .irc_channel }}</a>
-</p>
-
+<p><strong>IRC:</strong> <a href="{{ .irc_server | safeURL }}{{ .irc_channel }}">{{ .irc_channel }}</a></p>
 {{ end }}
 
+
 <p>
   <strong>Linguaggio:</strong>
   {{ if .IsTranslated }}
-  {{ range .Translations }}
-  <a href="{{ .Permalink }}">{{ index .Site.Params.languageNames .Lang }}</a>
-  {{ end }}
+    {{ range .Translations }}
+      <a href="{{ .Permalink }}">{{ .Site.Language.LanguageName }}</a>
+    {{ end }}
   {{ end }}
 </p>