Merge branch 'main' of https://github.com/MihailRis/VoxelEngine-Cpp

MihailRis · Dec 26, 2023 · 1b51fdb · 1b51fdb
2 parents 307df37 + ee29777
commit 1b51fdb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/frontend/locale/langs.cpp b/src/frontend/locale/langs.cpp
@@ -143,15 +143,20 @@ void langs::load(const path& resdir,
                  const vector<ContentPack>& packs) {
     unique_ptr<Lang> lang (new Lang(locale));
     load(resdir, fallback, packs, *lang.get());
-    load(resdir, locale, packs, *lang.get());
+    if (locale != fallback) {
+        load(resdir, locale, packs, *lang.get());
+    }
     current.reset(lang.release());
 }
 
 void langs::setup(const path& resdir,
-                  const string& locale,
+                  string locale,
                   const vector<ContentPack>& packs) {
     string fallback = langs::FALLBACK_DEFAULT;
     langs::loadLocalesInfo(resdir, fallback);
+    if (langs::locales_info.find(locale) == langs::locales_info.end()) {
+        locale = fallback;
+    }
     langs::load(resdir, locale, fallback, packs);
 }
 

diff --git a/src/frontend/locale/langs.h b/src/frontend/locale/langs.h
@@ -65,7 +65,7 @@ namespace langs {
                                    const std::wstring& context);
 
     extern void setup(const std::filesystem::path& resdir,
-                      const std::string& locale,
+                      std::string locale,
                       const std::vector<ContentPack>& packs);
 }