UI: Workaround for mixed locales

KD-lab-Open-Source · May 6, 2024 · 1718d9a · 1718d9a
1 parent b0531de
commit 1718d9a
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 4 deletions.
diff --git a/Source/Game/GameContent.cpp b/Source/Game/GameContent.cpp
@@ -390,13 +390,12 @@ void loadAddonET(ModMetadata& mod) {
         }
     } else {
         //This is a reworked ET
-
         paths["Resource/Models"] = {};
     }
 
     //Load texts, first try current lang, then english, then russian
-    std::string locale = getLocale();
-    std::string locpath = getLocDataPath();
+    const std::string& locale = getLocale();
+    const std::string& locpath = getLocDataPath();
     std::vector<std::string> lang_paths;
     lang_paths.emplace_back(locpath);
     lang_paths.emplace_back("Resource/LocData/English/");

diff --git a/Source/Render/src/VisGeneric.cpp b/Source/Render/src/VisGeneric.cpp
@@ -700,7 +700,7 @@ cFont* cVisGeneric::CreateGameFont(const char* TextureFileName, int height, bool
 	if(TextureFileName==nullptr||TextureFileName[0]==0) return nullptr;
 
     if (locale.empty()) {
-        locale = getLocale();
+        locale = getDefaultFontLocale();
     }
 
 	std::vector<cFontInternal*>::iterator it;

diff --git a/Source/Util/Localization.cpp b/Source/Util/Localization.cpp
@@ -8,6 +8,7 @@
 
 bool isLocaleInit = false;
 std::string localeCurrent;
+std::string localeDefaultFont;
 std::string localePath;
 std::vector<std::string> localesAvailable;
 
@@ -117,6 +118,17 @@ void initLocale() {
         fprintf(stdout, "Current locale path: %s\n", localePath.c_str());
     }
 
+    //TODO workaround to fix multiplayer games with mixed russian locale and non russian locale players
+    localeDefaultFont.clear();
+    if (localeCurrent == "english") {
+        for (auto& locale : localesAvailable) {
+            if (stricmp(locale.c_str(), "russian") == 0) {
+                localeDefaultFont = "russian";
+                break;
+            }
+        }
+    }
+
     isLocaleInit = true;
 }
 
@@ -127,6 +139,17 @@ const std::string& getLocale() {
     return localeCurrent;
 }
 
+const std::string& getDefaultFontLocale() {
+    if (!isLocaleInit) {
+        initLocale();
+    }
+    if (localeDefaultFont.empty()) {
+        return localeCurrent;
+    } else {
+        return localeDefaultFont;
+    }
+}
+
 const std::vector<std::string>& getLocales() {
     if (!isLocaleInit) {
         initLocale();

diff --git a/Source/Util/Localization.h b/Source/Util/Localization.h
@@ -16,6 +16,7 @@ struct LocalizedText {
 
 void initLocale();
 const std::string& getLocale();
+const std::string& getDefaultFontLocale();
 const std::vector<std::string>& getLocales();
 const char* getLocRootPath();
 const std::string& getLocDataPath();