MattTheTekie/devilutionX
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Interleave non-regional fallback locales after last regional variation

Browse source
This commit is contained in:
ephphatha 2021-12-08 23:12:35 +11:00 • committed by Anders Jenbo
commit a1652bd5d6
2 changed files with 13 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Source/options.cpp
View file

@ -986,6 +986,17 @@ void OptionEntryLanguageCode::LoadFromIni(string_view category)
locales.emplace_back(std::locale("").name().substr(0, 5));
#endif
// Insert non-regional locale codes after the last regional variation so we fallback to neutral translations if no regional translation exists that meets user preferences.
for (auto localeIter = locales.rbegin(); localeIter != locales.rend(); localeIter++) {
auto regionSeparator = localeIter->find('_');
if (regionSeparator != std::string::npos) {
std::string neutralLocale = localeIter->substr(0, regionSeparator);
if (std::find(locales.rbegin(), localeIter, neutralLocale) == localeIter) {
localeIter = std::make_reverse_iterator(locales.insert(localeIter.base(), neutralLocale));
}
}
}
LogVerbose("Found {} user preferred locales", locales);
for (const auto &locale : locales) {
@ -997,25 +1008,6 @@ void OptionEntryLanguageCode::LoadFromIni(string_view category)
}
}
std::vector<std::string> fallbackLocales;
fallbackLocales.reserve(locales.size());
for (const auto &locale : locales) {
std::string neutralLocale = locale.substr(0, locale.find('_'));
if (std::find(fallbackLocales.cbegin(), fallbackLocales.cend(), neutralLocale) == fallbackLocales.cend()) {
fallbackLocales.push_back(neutralLocale);
}
}
for (const auto &fallbackLocale : fallbackLocales) {
LogVerbose("Trying to load fallback translation: {}", fallbackLocale);
if (HasTranslation(fallbackLocale)) {
LogVerbose("Found matching fallback locale: {}", fallbackLocale);
CopyUtf8(szCode, fallbackLocale, sizeof(szCode));
return;
}
}
LogVerbose("No suitable translation found");
strcpy(szCode, "en");
}