PulseStudio/VoxelEngine
PulseStudio/VoxelEngine
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

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

Browse Source
This commit is contained in:
A-lex-Ra 2023-12-26 19:55:14 +06:00
commit 1b51fdbd0b
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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);
}

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

@ -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);
}