liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Copy locale suffix to new LANG setting (by @heckflosse, #4319)

Browse Source
This commit is contained in:
Flössie
2018-02-08 21:28:44 +01:00
parent 4a2b9468d1
commit b53e773fbb
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
rtgui/multilangmgr.cc
View File

@@ -114,11 +114,22 @@ const LocaleToLang localeToLang;
void setGtkLanguage(const Glib::ustring &language) void setGtkLanguage(const Glib::ustring &language)
{ {
auto l = localeToLang.getLocale(language); std::string lang = localeToLang.getLocale(language);
if (lang != "C") {
const std::string env_lang = getenv("LANG");
if (!env_lang.empty()) {
const std::string::size_type suffix_pos = env_lang.find_first_of(".");
if (suffix_pos != std::string::npos) {
lang += env_lang.substr(suffix_pos);
}
}
}
#ifdef WIN32 #ifdef WIN32
putenv(("LANG=" + l).c_str()); putenv(("LANG=" + lang).c_str());
#else #else
setenv("LANG", l.c_str(), true); setenv("LANG", lang.c_str(), true);
#endif #endif
} }