voxelcoreprojects/voxelcore
1
0
Fork 0
mirror of https://github.com/MihailRis/voxelcore.git synced 2026-10-10 21:41:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Critical fix

Browse source
This commit is contained in:
MihailRis 2023-12-26 13:11:40 +03:00
parent 92a08a92ef
commit ee29777765
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/frontend/locale/langs.cpp
View file

@ -120,15 +120,20 @@ void langs::load(const path& resdir,
const vector<ContentPack>& packs) { const vector<ContentPack>& packs) {
unique_ptr<Lang> lang (new Lang(locale)); unique_ptr<Lang> lang (new Lang(locale));
load(resdir, fallback, packs, *lang.get()); 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()); current.reset(lang.release());
} }
void langs::setup(const path& resdir, void langs::setup(const path& resdir,
const string& locale, string locale,
const vector<ContentPack>& packs) { const vector<ContentPack>& packs) {
string fallback = langs::FALLBACK_DEFAULT; string fallback = langs::FALLBACK_DEFAULT;
langs::loadLocalesInfo(resdir, fallback); langs::loadLocalesInfo(resdir, fallback);
if (langs::locales_info.find(locale) == langs::locales_info.end()) {
locale = fallback;
}
langs::load(resdir, locale, fallback, packs); langs::load(resdir, locale, fallback, packs);
} }

2
src/frontend/locale/langs.h
View file

@ -62,7 +62,7 @@ namespace langs {
const std::wstring& context); const std::wstring& context);
extern void setup(const std::filesystem::path& resdir, extern void setup(const std::filesystem::path& resdir,
const std::string& locale, std::string locale,
const std::vector<ContentPack>& packs); const std::vector<ContentPack>& packs);
} }