Inherit translation setting from environment.
This ensures that users with a correctly-defined locale don't need to explicitely set the locale. - By dropping the setlocale content, it fixes the loading of translations. - Add a Debug log message to check what is put in the environment.dev-ui
parent
2173e86025
commit
6946155a56
|
@ -132,7 +132,7 @@ CApplication::CApplication()
|
||||||
|
|
||||||
m_dataPath = "./data";
|
m_dataPath = "./data";
|
||||||
|
|
||||||
m_language = LANGUAGE_ENGLISH;
|
m_language = LANGUAGE_ENV;
|
||||||
|
|
||||||
m_lowCPU = true;
|
m_lowCPU = true;
|
||||||
|
|
||||||
|
@ -290,9 +290,14 @@ bool CApplication::Create()
|
||||||
|
|
||||||
/* Gettext initialization */
|
/* Gettext initialization */
|
||||||
|
|
||||||
std::string locale = "C";
|
std::string locale = "";
|
||||||
switch (m_language)
|
switch (m_language)
|
||||||
{
|
{
|
||||||
|
default:
|
||||||
|
case LANGUAGE_ENV:
|
||||||
|
locale = "";
|
||||||
|
break;
|
||||||
|
|
||||||
case LANGUAGE_ENGLISH:
|
case LANGUAGE_ENGLISH:
|
||||||
locale = "en_US.utf8";
|
locale = "en_US.utf8";
|
||||||
break;
|
break;
|
||||||
|
@ -314,7 +319,8 @@ bool CApplication::Create()
|
||||||
langStr += locale;
|
langStr += locale;
|
||||||
strcpy(S_LANGUAGE, langStr.c_str());
|
strcpy(S_LANGUAGE, langStr.c_str());
|
||||||
putenv(S_LANGUAGE);
|
putenv(S_LANGUAGE);
|
||||||
setlocale(LC_ALL, locale.c_str());
|
setlocale(LC_ALL, "");
|
||||||
|
GetLogger()->Debug("Set locale to '%s'\n", locale.c_str());
|
||||||
|
|
||||||
std::string trPath = m_dataPath + "/" + m_dataDirs[DIR_I18N];
|
std::string trPath = m_dataPath + "/" + m_dataDirs[DIR_I18N];
|
||||||
bindtextdomain("colobot", trPath.c_str());
|
bindtextdomain("colobot", trPath.c_str());
|
||||||
|
|
|
@ -29,6 +29,7 @@
|
||||||
*/
|
*/
|
||||||
enum Language
|
enum Language
|
||||||
{
|
{
|
||||||
|
LANGUAGE_ENV = -1,
|
||||||
LANGUAGE_ENGLISH = 0,
|
LANGUAGE_ENGLISH = 0,
|
||||||
LANGUAGE_FRENCH = 1,
|
LANGUAGE_FRENCH = 1,
|
||||||
LANGUAGE_GERMAN = 2,
|
LANGUAGE_GERMAN = 2,
|
||||||
|
|
Loading…
Reference in New Issue