From 223ca8bc29483cb47b213c0a1ed4d031ca37b539 Mon Sep 17 00:00:00 2001
From: Henk Kalkwater <chris@netsoj.nl>
Date: Wed, 25 May 2022 14:46:37 +0200
Subject: [PATCH] Workaround broken l10n, upgrade deps

---
 dub.selections.json                           | 8 ++++----
 source/nl/netsoj/chris/blog/interfaces/http.d | 4 ++--
 views/parts/footer.dt                         | 2 +-
 views/parts/page.dt                           | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dub.selections.json b/dub.selections.json
index 4ad848d..a642910 100644
--- a/dub.selections.json
+++ b/dub.selections.json
@@ -4,8 +4,8 @@
 		"botan": "1.12.19",
 		"botan-math": "1.0.3",
 		"diet-ng": "1.8.0",
-		"dyaml": "0.8.3",
-		"eventcore": "0.9.17",
+		"dyaml": "0.8.6",
+		"eventcore": "0.9.20",
 		"fswatch": "0.5.0",
 		"libasync": "0.8.6",
 		"libevent": "2.0.2+2.0.16",
@@ -15,7 +15,7 @@
 		"stdx-allocator": "2.77.5",
 		"taggedalgebraic": "0.11.22",
 		"tinyendian": "0.2.0",
-		"vibe-core": "1.19.0",
-		"vibe-d": "0.9.3"
+		"vibe-core": "1.22.3",
+		"vibe-d": "0.9.4"
 	}
 }
diff --git a/source/nl/netsoj/chris/blog/interfaces/http.d b/source/nl/netsoj/chris/blog/interfaces/http.d
index 0437bcb..b5a325e 100644
--- a/source/nl/netsoj/chris/blog/interfaces/http.d
+++ b/source/nl/netsoj/chris/blog/interfaces/http.d
@@ -58,7 +58,7 @@ struct TranslateContext {
 	mixin translationModule!"mijnblog";
 	static string determineLanguage(scope HTTPServerRequest req) {
 		if ("lang" !in req.query) return req.determineLanguageByHeader(languages); // default behaviour using "Accept-Language" header
-		return req.query.get("lang", "en_GB");
+		return determineLanguageByHeader(req.query.get("lang", "en_GB"), languages);
 	}
 }
 
@@ -80,7 +80,7 @@ string singleResponseMixin(string arrayName, string templateName) {
 			break;
 		default:
 		case HTML:
-			render!("` ~ templateName ~ `", content);
+			res.render!("` ~ templateName ~ `", content);
 			break;
 		}`;
 	}
diff --git a/views/parts/footer.dt b/views/parts/footer.dt
index 1385b34..b018fe1 100644
--- a/views/parts/footer.dt
+++ b/views/parts/footer.dt
@@ -1,2 +1,2 @@
 p 
-	small& template.page.copyright
+	small !{trWeb("template.page.copyright")}
diff --git a/views/parts/page.dt b/views/parts/page.dt
index bf91a60..513f375 100644
--- a/views/parts/page.dt
+++ b/views/parts/page.dt
@@ -46,7 +46,7 @@ html(prefix="og: http://ogp.me/ns#")
 		section.header-navigation
 			header
 				img.logo(src="/static/img/logo.png", alt="The logo of the website: the letter C drawn in an unprofessional manner with wobbly eyes on put on top")
-				p& template.page.name
+				p #{trWeb("template.page.name")}
 			nav
 				ul
 					- menuItem("template.menu.home", "/");