From cd067817008567f0d7066690441c0ee1b48a5b93 Mon Sep 17 00:00:00 2001
From: Sam Al-Sapti <sam@sapti.me>
Date: Sat, 29 Jul 2023 16:56:29 +0200
Subject: [PATCH 1/3] Fix language-aware redirect from header logo and other
 stuff

---
 themes/datacoop2020/layouts/_default/baseof.html |  4 ++--
 themes/datacoop2020/layouts/partials/badges.html |  4 ++--
 themes/datacoop2020/layouts/partials/head.html   | 11 +++++------
 themes/datacoop2020/theme.yaml                   |  2 +-
 4 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/themes/datacoop2020/layouts/_default/baseof.html b/themes/datacoop2020/layouts/_default/baseof.html
index ab6ce44..8de261c 100644
--- a/themes/datacoop2020/layouts/_default/baseof.html
+++ b/themes/datacoop2020/layouts/_default/baseof.html
@@ -1,10 +1,10 @@
 <!doctype html>
-<html lang="{{ site.Language }}">
+<html lang="{{ .Site.Language.Lang }}">
     {{ partial "head.html" . }}
     <body>
         <aside>
             <header>
-                <a href="/"><img src="{{ printf "/static/img/logo_%s.svg" .Site.Language.Lang | absURL }}" alt="data coop logo" width="240" height="140"></a>
+                <a href="{{ .Site.Home.Permalink }}"><img src="/static/img/logo_{{ .Site.Language.Lang }}.svg" alt="data.coop logo" width="240" height="140"></a>
 
                 <div class="nav-toggle" id="nav-toggle-header">
                     <span id="nav-toggle-a"></span> 
diff --git a/themes/datacoop2020/layouts/partials/badges.html b/themes/datacoop2020/layouts/partials/badges.html
index 50a4f22..878e3ab 100644
--- a/themes/datacoop2020/layouts/partials/badges.html
+++ b/themes/datacoop2020/layouts/partials/badges.html
@@ -6,8 +6,8 @@
 {{ range $badge_key, $badge := $translated_badges.badges.badges }}
 
   <div class="badge-icon">
-  {{$svg := printf "static/static/img/badges/%s" .icon}}
-  {{ $svg  | readFile | safeHTML }}
+  {{ $svg := printf "static/static/img/badges/%s" .icon }}
+  {{ $svg | readFile | safeHTML }}
   </div>
   <div class="badge-name">{{ title .name }}</div>
 
diff --git a/themes/datacoop2020/layouts/partials/head.html b/themes/datacoop2020/layouts/partials/head.html
index 3985763..c2dd48c 100644
--- a/themes/datacoop2020/layouts/partials/head.html
+++ b/themes/datacoop2020/layouts/partials/head.html
@@ -9,17 +9,16 @@
         <meta name="description" content="{{ . }}">
         {{ end }}
 
-        <link rel="apple-touch-icon" sizes="180x180" href="{{ "/static/img" | absURL }}/apple-touch-icon.png">
-        <link rel="icon" type="image/png" sizes="32x32" href="{{ "/static/img" | absURL }}/favicon-32x32.png">
-        <link rel="icon" type="image/png" sizes="16x16" href="{{ "/static/img" | absURL }}/favicon-16x16.png">
+        <link rel="apple-touch-icon" sizes="180x180" href="/static/img/apple-touch-icon.png">
+        <link rel="icon" type="image/png" sizes="32x32" href="/static/img/favicon-32x32.png">
+        <link rel="icon" type="image/png" sizes="16x16" href="/static/img/favicon-16x16.png">
         <link rel="manifest" href="{{ "" | absURL }}/site.webmanifest">
-        <link rel="mask-icon" href="{{ "/static/img" | absURL }}/safari-pinned-tab.svg" color="#4b3aba">
+        <link rel="mask-icon" href="/static/img/safari-pinned-tab.svg" color="#4b3aba">
         <meta name="msapplication-TileColor" content="#4b3aba">
         <meta name="theme-color" content="#4b3aba">
 
-        {{ $style := resources.Get "static/css/style.scss" | resources.ToCSS | resources.Minify | resources.Fingerprint  "sha512" }}
+        {{ $style := resources.Get "static/css/style.scss" | resources.ToCSS | resources.Minify | resources.Fingerprint "sha512" }}
         <link rel="stylesheet" href="{{ $style.RelPermalink }}" integrity="{{ $style.Data.Integrity }}">
 
         <title>{{ .Title }} | {{ .Site.Title }}</title>
-
     </head>
diff --git a/themes/datacoop2020/theme.yaml b/themes/datacoop2020/theme.yaml
index 48f828e..a65d34e 100644
--- a/themes/datacoop2020/theme.yaml
+++ b/themes/datacoop2020/theme.yaml
@@ -3,7 +3,7 @@ license: "MIT"
 licenselink: "https://github.com/zwbetz-gh/minimal-bootstrap-hugo-theme/blob/master/LICENSE"
 description: "Yay data.coop theme - started with this one https://github.com/zwbetz-gh/minimal-bootstrap-hugo-theme/"
 homepage: "https://data.coop"
-tags: ["nice",]
+tags: ["nice"]
 features: ["responsive", "small page size", "fuck google", "no tracking"]
 min_version: "0.60.1"
 

From d24cdab7e967c6a9e252e97c3a283c5d3065c221 Mon Sep 17 00:00:00 2001
From: Sam Al-Sapti <sam@sapti.me>
Date: Sat, 29 Jul 2023 17:32:34 +0200
Subject: [PATCH 2/3] Use ref shortcode for links to ensure proper language
 redirects

---
 content/about.da.md           | 2 +-
 content/about.en.md           | 2 +-
 content/membership.da.md      | 4 ++--
 content/membership.en.md      | 6 +++---
 content/rights.en.md          | 2 +-
 content/services/_index.da.md | 6 +++---
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/content/about.da.md b/content/about.da.md
index 9eb3269..3e2aa97 100644
--- a/content/about.da.md
+++ b/content/about.da.md
@@ -2,7 +2,7 @@
 title: "Om os"
 ---
 
-**data.coop** er en forening og et kooperativ.
+**[data.coop]({{< ref "/" >}})** er en forening og et kooperativ.
 
 Vi — medlemmerne i kooperativet — ejer vores egne data.
 
diff --git a/content/about.en.md b/content/about.en.md
index 91bbc59..cfedd56 100644
--- a/content/about.en.md
+++ b/content/about.en.md
@@ -2,7 +2,7 @@
 title: "About"
 ---
 
-**data.coop** is an association and a cooperative.
+**[data.coop]({{< ref "/" >}})** is an association and a cooperative.
 
 We — the members of the cooperative — own our own data.
 
diff --git a/content/membership.da.md b/content/membership.da.md
index 817c312..fd7a49b 100644
--- a/content/membership.da.md
+++ b/content/membership.da.md
@@ -2,11 +2,11 @@
 title: Bliv medlem
 ---
 
-[data.coop](https://data.coop) er en demokratisk forening. Medlemmer bestemmer
+[data.coop]({{< ref "/" >}}) er en demokratisk forening. Medlemmer bestemmer
 over foreningens generelle drift og hvordan data skal forvaltes. Dette sker som i en helt klassisk forening i henhold til vores vedtægter på den årlige
 generalforsamling.
 
-Du bør læse vores [vedtægter](/rights/) og især vores [Acceptable Usage Policy (AUP)](https://git.data.coop/data.coop/dokumenter/src/branch/main/Acceptable%20Usage%20Policy.md) inden du melder dig ind. Har du spørgsmål, kan du finde os på [Matrix og IRC](/about/) eller [sende en e-mail til bestyrelsen](mailto:board@data.coop).
+Du bør læse vores [vedtægter]({{< ref "/rights.md" >}}) og især vores [Acceptable Usage Policy (AUP)](https://git.data.coop/data.coop/dokumenter/src/branch/main/Acceptable%20Usage%20Policy.md) inden du melder dig ind. Har du spørgsmål, kan du finde os på [Matrix og IRC]({{< ref "/about.md" >}}) eller [sende en e-mail til bestyrelsen](mailto:board@data.coop).
 
 Du bliver medlem ved at overføre penge til vores konto og sende en email til
 vores kasserer, [benjaoming@data.coop](mailto:benjaoming@data.coop), med dit navn.
diff --git a/content/membership.en.md b/content/membership.en.md
index 7e401db..d55516f 100644
--- a/content/membership.en.md
+++ b/content/membership.en.md
@@ -2,14 +2,14 @@
 title: Become a member
 ---
 
-[data.coop](https://data.coop) is a cooperative established as a democratic association.
+[data.coop]({{< ref "/" >}}) is a cooperative established as a democratic association.
 The members decide on the association's operations and how data should be governed.
 Governance resembles any classic association: We have legal statutes and formal general assemblies.
 
-You need to read our [statutes](/rights/) and our 
+You need to read our [statutes]({{< relref "/rights.md" >}}) and our
 [Acceptable Usage Policy (AUP)](https://git.data.coop/data.coop/dokumenter/src/branch/main/Acceptable%20Usage%20Policy.md)
 before becoming a member.
-If you have questions, you can find us on [Matrix or IRC](/about/) or [send an email to the board](mailto:board@data.coop).
+If you have questions, you can find us on [Matrix or IRC]({{< ref "/about.md" >}}) or [send an email to the board](mailto:board@data.coop).
 
 *English speakers:* We would love to have you as a member.
 Many parts of this organization are already in English,
diff --git a/content/rights.en.md b/content/rights.en.md
index 180111e..98867dd 100644
--- a/content/rights.en.md
+++ b/content/rights.en.md
@@ -7,5 +7,5 @@ data.coop does not have a translation of its Danish statutes.
 The reason is that we cannot guarantee that the democratic process that established the Danish statutes would understand an English translation in the same way.
 
 While we work out this challenge,
-we encourage that you use some auto-generated translation of the [Danish statutes](/rights/)
+we encourage that you use some auto-generated translation of the [Danish statutes]({{< ref path="/rights.md" lang="da" >}})
 and ask us questions about anything that would seem unclear.
diff --git a/content/services/_index.da.md b/content/services/_index.da.md
index 5b13f7c..0fb305b 100644
--- a/content/services/_index.da.md
+++ b/content/services/_index.da.md
@@ -5,10 +5,10 @@ title: Tjenester
 
 Visse tjenester **data.coop** driver er kun for medlemmer, andre er åbne for alle.
 
-Alle tjenester er benævnt med [badges](/services/#badges), der deklarerer i hvor høj grad den
+Alle tjenester er benævnt med [badges]({{< ref "/services/#badges" >}}), der deklarerer i hvor høj grad den
 enkelte tjeneste lever op til [kerneprincipperne defineret i formålsparagraffen
-i vores vedtægter](/rights/#-2-formål).
+i vores vedtægter]({{< ref "/rights.md#-2-formål" >}}).
 
-Vi har skrevet en definition af [hvad de forskellige badges dækker over](/services/#badges).
+Vi har skrevet en definition af [hvad de forskellige badges dækker over]({{< ref "/services/#badges" >}}).
 
 Klik på hver tjenestes navn for at se detaljer:

From 2cab915021bd59b1d58388c32ca1d07e289b711a Mon Sep 17 00:00:00 2001
From: Sam Al-Sapti <sam@sapti.me>
Date: Sat, 29 Jul 2023 17:34:27 +0200
Subject: [PATCH 3/3] Remove done todo

---
 themes/datacoop2020/layouts/partials/badges.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/themes/datacoop2020/layouts/partials/badges.html b/themes/datacoop2020/layouts/partials/badges.html
index 878e3ab..f0aa5e9 100644
--- a/themes/datacoop2020/layouts/partials/badges.html
+++ b/themes/datacoop2020/layouts/partials/badges.html
@@ -1,7 +1,6 @@
 <h2 id="badges">{{ i18n "badges_headline" }}</h2>
 
 <section class="badge-definitions">
-{{/* TODO: This needs to be sensitive to current language */}}
 {{- $translated_badges := index $.Site.Data.badges .Lang }}
 {{ range $badge_key, $badge := $translated_badges.badges.badges }}
 
