diff options
| author | Piotr Dziwinski <piotrdz@gmail.com> | 2012-12-15 20:23:58 +0100 |
|---|---|---|
| committer | Piotr Dziwinski <piotrdz@gmail.com> | 2012-12-15 20:23:58 +0100 |
| commit | 72ce040054f1ee20576094220075af4283674720 (patch) | |
| tree | e59d2837a45ec81233423fa7aa47c4cfab4fabee /src/app | |
| parent | 4a075edfec7cc0810c577b490e4a9231ebdd8afe (diff) | |
| parent | a4cf777fb8cb939db10998853fc9e40deb64aa8d (diff) | |
| download | colobot-72ce040054f1ee20576094220075af4283674720.tar.gz colobot-72ce040054f1ee20576094220075af4283674720.tar.bz2 colobot-72ce040054f1ee20576094220075af4283674720.zip | |
Merge branch 'master' into dev
Diffstat (limited to 'src/app')
| -rw-r--r-- | src/app/app.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/app/app.cpp b/src/app/app.cpp index 81d874d..751ff21 100644 --- a/src/app/app.cpp +++ b/src/app/app.cpp @@ -132,7 +132,7 @@ CApplication::CApplication() m_dataPath = "./data"; - m_language = LANGUAGE_ENGLISH; + m_language = LANGUAGE_ENV; m_lowCPU = true; @@ -290,9 +290,14 @@ bool CApplication::Create() /* Gettext initialization */ - std::string locale = "C"; + std::string locale = ""; switch (m_language) { + default: + case LANGUAGE_ENV: + locale = ""; + break; + case LANGUAGE_ENGLISH: locale = "en_US.utf8"; break; @@ -314,7 +319,8 @@ bool CApplication::Create() langStr += locale; strcpy(S_LANGUAGE, langStr.c_str()); 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]; bindtextdomain("colobot", trPath.c_str()); |