From c6aad324a0bf9da0844a6698531020fa7c61bced Mon Sep 17 00:00:00 2001
From: CherryKitten <git@cherrykitten.dev>
Date: Tue, 13 Dec 2022 20:04:29 +0100
Subject: [PATCH] Always fetch locales when initiating client

---
 packages/backend/src/server/web/boot.js | 49 +++++++++++--------------
 1 file changed, 22 insertions(+), 27 deletions(-)

diff --git a/packages/backend/src/server/web/boot.js b/packages/backend/src/server/web/boot.js
index b6c862743..0342603c6 100644
--- a/packages/backend/src/server/web/boot.js
+++ b/packages/backend/src/server/web/boot.js
@@ -22,37 +22,32 @@
 		renderError('SOMETHING_HAPPENED_IN_PROMISE', e);
 	};
 
-	const v = localStorage.getItem('v') || VERSION;
-
 	//#region Detect language & fetch translations
-	const localeVersion = localStorage.getItem('localeVersion');
-	const localeOutdated = (localeVersion == null || localeVersion !== v);
-
-	if (!localStorage.hasOwnProperty('locale') || localeOutdated) {
-		const supportedLangs = LANGS;
-		let lang = localStorage.getItem('lang');
-		if (lang == null || !supportedLangs.includes(lang)) {
-			if (supportedLangs.includes(navigator.language)) {
-				lang = navigator.language;
-			} else {
-				lang = supportedLangs.find(x => x.split('-')[0] === navigator.language);
-
-				// Fallback
-				if (lang == null) lang = 'en-US';
-			}
-		}
-
-		const res = await fetch(`/assets/locales/${lang}.${v}.json`);
-		if (res.status === 200) {
-			localStorage.setItem('lang', lang);
-			localStorage.setItem('locale', await res.text());
-			localStorage.setItem('localeVersion', v);
+	const v = localStorage.getItem('v') || VERSION;
+	
+	const supportedLangs = LANGS;
+	let lang = localStorage.getItem('lang');
+	if (lang == null || !supportedLangs.includes(lang)) {
+		if (supportedLangs.includes(navigator.language)) {
+			lang = navigator.language;
 		} else {
-			await checkUpdate();
-			renderError('LOCALE_FETCH');
-			return;
+			lang = supportedLangs.find(x => x.split('-')[0] === navigator.language);
+
+			// Fallback
+			if (lang == null) lang = 'en-US';
 		}
 	}
+
+	const res = await fetch(`/assets/locales/${lang}.${v}.json`);
+	if (res.status === 200) {
+		localStorage.setItem('lang', lang);
+		localStorage.setItem('locale', await res.text());
+		localStorage.setItem('localeVersion', v);
+	} else {
+		await checkUpdate();
+		renderError('LOCALE_FETCH');
+		return;
+	}
 	//#endregion
 
 	//#region Script