Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-11-29 17:45:38 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Changed to using SDL_GetPreferredLocales() also on Linux

Browse source 
Also set the LANGUAGE environment variable on Linux
This commit is contained in:
Leon Styhre 2024-06-30 23:22:48 +02:00
parent 552f540a49
commit 302305b3ee
1 changed files with 4 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
es-core/src/utils/LocalizationUtil.cpp
View file

@ -40,10 +40,9 @@ namespace Utils
locale.erase(locale.find('\0')); locale.erase(locale.find('\0'));
return locale; return locale;
#elif defined(__APPLE__) #else
// The SDL locale function does not seem to always return the correct result // SDL_GetPreferredLocales() does not seem to always return accurate results
// (at least not on Windows) but for macOS it's very annoying to use the OS-supplied // on Windows but for all other operating systems we use it.
// locale facilities, so here we still use the SDL method.
SDL_Locale* preferredLocales {SDL_GetPreferredLocales()}; SDL_Locale* preferredLocales {SDL_GetPreferredLocales()};
if (preferredLocales == nullptr) if (preferredLocales == nullptr)
@ -55,30 +54,6 @@ namespace Utils
SDL_free(preferredLocales); SDL_free(preferredLocales);
return primaryLocale; return primaryLocale;
#else
std::string language;
// The LANGUAGE environment variable takes precedence over LANG.
if (getenv("LANGUAGE") != nullptr)
language = getenv("LANGUAGE");
const std::vector<std::string> languageValues {
Utils::String::delimitedStringToVector(language, ":")};
for (auto value : languageValues) {
if (std::find(sSupportedLanguages.cbegin(), sSupportedLanguages.cend(), value) !=
sSupportedLanguages.cend()) {
return value;
}
}
if (getenv("LANG") != nullptr)
language = getenv("LANG");
if (language.empty())
return "en_US";
return language.substr(0, language.find("."));
#endif #endif
} }
@ -120,10 +95,8 @@ namespace Utils
const LCID localeID {LocaleNameToLCID(Utils::String::stringToWideString(locale).c_str(), const LCID localeID {LocaleNameToLCID(Utils::String::stringToWideString(locale).c_str(),
LOCALE_ALLOW_NEUTRAL_NAMES)}; LOCALE_ALLOW_NEUTRAL_NAMES)};
SetThreadLocale(localeID); SetThreadLocale(localeID);
#elif defined(__APPLE__)
// This is seemingly needed specifically on macOS but not on Linux.
setenv("LANGUAGE", locale.c_str(), 1);
#else #else
setenv("LANGUAGE", locale.c_str(), 1);
setlocale(LC_MESSAGES, std::string {locale + ".UTF-8"}.c_str()); setlocale(LC_MESSAGES, std::string {locale + ".UTF-8"}.c_str());
#endif #endif
textdomain(locale.c_str()); textdomain(locale.c_str());