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

Revert "MultiLangMgr::getOSUserLanguage (): get rid of special windows code"

Browse Source 
This reverts commit 562ed3b22a964b6561fcb2bc18dd5a0322a580ce.
This commit is contained in:
heckflosse 2019-01-04 14:02:24 +01:00
parent d43ccc5e81
commit de6ee457e6
1 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
rtgui/multilangmgr.cc
View File

@ -209,6 +209,27 @@ Glib::ustring MultiLangMgr::getOSUserLanguage ()
{ {
Glib::ustring langName ("default"); Glib::ustring langName ("default");
#if defined (WIN32)
const LCID localeID = GetUserDefaultLCID ();
TCHAR localeName[18];
const int langLen = GetLocaleInfo (localeID, LOCALE_SISO639LANGNAME, localeName, 9);
if (langLen <= 0) {
return langName;
}
localeName[langLen - 1] = '-';
const int countryLen = GetLocaleInfo (localeID, LOCALE_SISO3166CTRYNAME, &localeName[langLen], 9);
if (countryLen <= 0) {
return langName;
}
langName = localeToLang (localeName);
#elif defined (__linux__) || defined (__APPLE__)
// Query the current locale and force decimal point to dot. // Query the current locale and force decimal point to dot.
const char *locale = getenv("LANG"); const char *locale = getenv("LANG");
if (locale || (locale = setlocale (LC_CTYPE, ""))) { if (locale || (locale = setlocale (LC_CTYPE, ""))) {
@ -217,5 +238,7 @@ Glib::ustring MultiLangMgr::getOSUserLanguage ()
setlocale (LC_NUMERIC, "C"); setlocale (LC_NUMERIC, "C");
#endif
return langName; return langName;
} }