From a1e9ad0b427f340ebcaf413bd34f1ab8263b5629 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Sat, 30 Jul 2022 08:15:20 -0500
Subject: [PATCH] Fix locale loading

---
 scripts/client/gui.js    | 4 ----
 scripts/client/locale.js | 9 ++++++---
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/scripts/client/gui.js b/scripts/client/gui.js
index 3f6e1506..98058341 100644
--- a/scripts/client/gui.js
+++ b/scripts/client/gui.js
@@ -69,10 +69,6 @@ function initGUI() {
 	logToConsole(LOG_DEBUG, `[VRR.GUI] All GUI created successfully!`);
 
 	loadLocaleConfig();
-	loadAllLocaleStrings();
-
-	resetGUIStrings();
-	resetLocaleChooserOptions();
 
 	sendNetworkEventToServer("agrp.guiReady", true);
 };
diff --git a/scripts/client/locale.js b/scripts/client/locale.js
index c2677556..9166f443 100644
--- a/scripts/client/locale.js
+++ b/scripts/client/locale.js
@@ -37,6 +37,9 @@ function getAvailableLocaleOptions() {
 function loadLocaleConfig() {
 	let configFile = loadTextFile("config/client/locale.json");
 	getServerData().localeOptions = JSON.parse(configFile);
+
+	resetLocaleChooserOptions();
+	loadAllLocaleStrings();
 }
 
 // ===========================================================================
@@ -50,6 +53,8 @@ function loadAllLocaleStrings() {
 
 		getServerData().localeStrings[i] = localeData;
 	}
+
+	resetGUIStrings();
 }
 
 // ===========================================================================
@@ -58,6 +63,4 @@ function setLocale(tempLocaleId) {
 	logToConsole(LOG_DEBUG, `[VRR.Locale] Setting locale to ${tempLocaleId} (${getServerData().localeOptions[tempLocaleId].englishName})`);
 	localLocaleId = tempLocaleId;
 	resetGUIStrings();
-}
-
-// ===========================================================================
\ No newline at end of file
+}
\ No newline at end of file