From 3114e030b204e4da9f927578075f489dff8e40f3 Mon Sep 17 00:00:00 2001
From: Dominik Pschenitschni <mail@celement.de>
Date: Mon, 24 Oct 2022 18:59:04 +0200
Subject: [PATCH] fix: do not change language to the current one

---
 src/i18n/index.ts | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/i18n/index.ts b/src/i18n/index.ts
index 0dd4a4534..5a63a1dc5 100644
--- a/src/i18n/index.ts
+++ b/src/i18n/index.ts
@@ -50,18 +50,17 @@ export async function loadLanguageAsync(lang: SupportedLocale) {
 		throw new Error()
 	}
 
-	if (
-		// If the same language
-		i18n.global.locale === lang ||
-		// If the language was already loaded
-		i18n.global.availableLocales.includes(lang)
-	) {
-		return setI18nLanguage(lang)
+	// do not change language to the current one
+	if (i18n.global.locale === lang) {
+		return
 	}
 
 	// If the language hasn't been loaded yet
-	const messages = await import(`./lang/${lang}.json`)
-	i18n.global.setLocaleMessage(lang, messages.default)
+	if (!i18n.global.availableLocales.includes(lang)) {
+		const messages = await import(`./lang/${lang}.json`)
+		i18n.global.setLocaleMessage(lang, messages.default)
+	}
+
 	return setI18nLanguage(lang)
 }