From 823e3e36eb336036d9822856a8b799b938012b60 Mon Sep 17 00:00:00 2001
From: Simone Romano <19979417+SunTrustDev@users.noreply.github.com>
Date: Thu, 8 Jan 2026 17:55:46 +0100
Subject: [PATCH] FIX: Always load locale data over default locale, to avoid
 missing data and crash when player does not change his language

---
 assets/root/localeinfo.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/assets/root/localeinfo.py b/assets/root/localeinfo.py
index fe6e8790..c8b6e214 100644
--- a/assets/root/localeinfo.py
+++ b/assets/root/localeinfo.py
@@ -113,6 +113,13 @@ def LoadLocaleFile(srcFileName, localeDict):
 
 LoadLocaleFile("{:s}/locale_game.txt".format(APP_GET_LOCALE_PATH), locals())
 
+try:
+    currentLocalePath = app.GetLocalePath()
+    if not app.LoadLocaleData(currentLocalePath):
+        dbg.TraceError("localeInfo: Failed to load C++ locale data from %s" % currentLocalePath)
+except Exception, e:
+    dbg.TraceError("localeInfo: Error loading C++ locale data: %s" % str(e))
+
 # Option pvp messages
 OPTION_PVPMODE_MESSAGE_DICT = {
 	0: PVP_MODE_NORMAL,