immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Modified locale setting code 

I'm doing my best to fix #445. At least shouldn't crash anymore.
Needs more testing.
master
krzys-h 2015-03-21 13:09:05 +01:00
parent a60a4590b2
commit 87cf056158
1 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/app/app.cpp
View File

@ -1682,8 +1682,29 @@ void CApplication::SetLanguage(Language language)
putenv(S_LANGUAGE);
GetLogger()->Trace("SetLanguage: Set LANGUAGE=%s in environment\n", locale.c_str());
}
std::locale::global(std::locale(std::locale(""), "C", std::locale::numeric));
std::setlocale(LC_ALL, ""); // Load system locale
std::setlocale(LC_NUMERIC, "C"); // Force numeric locale to "C" (fixes decimal point problems)
char* systemLocale = std::setlocale(LC_ALL, nullptr); // Get current locale configuration
GetLogger()->Debug("System locale: %s\n", systemLocale);
// Update C++ locale
try
{
std::locale::global(std::locale(systemLocale));
}
catch(...)
{
GetLogger()->Warn("Failed to update locale, possibly incorect system configuration. Will fallback to classic locale.\n");
try
{
std::locale::global(std::locale::classic());
std::setlocale(LC_ALL, systemLocale); // C locale might still work correctly
}
catch(...)
{
GetLogger()->Warn("Failed to set classic locale. Something is really messed up in your system configuration. Translations probably won't work.\n");
}
}
bindtextdomain("colobot", m_pathManager->GetLangPath().c_str());
bind_textdomain_codeset("colobot", "UTF-8");