diff options
author | Piotr Dziwinski <piotrdz@gmail.com> | 2013-01-07 19:43:04 +0100 |
---|---|---|
committer | Piotr Dziwinski <piotrdz@gmail.com> | 2013-01-07 19:43:04 +0100 |
commit | 5a6b3f005a83363d323e00b499756d6ecc277574 (patch) | |
tree | 7d18ebbb9dd63f2c160ff011ef29e24d49c12efa /src/app/app.cpp | |
parent | edb1c0cbd62bfe7c620d7c8399f49acb98994b85 (diff) | |
parent | ff5c89085415a370911793d5764dfb694fc43b7d (diff) | |
download | colobot-5a6b3f005a83363d323e00b499756d6ecc277574.tar.gz colobot-5a6b3f005a83363d323e00b499756d6ecc277574.tar.bz2 colobot-5a6b3f005a83363d323e00b499756d6ecc277574.zip |
Merge dev and dev-graphics
Diffstat (limited to 'src/app/app.cpp')
-rw-r--r-- | src/app/app.cpp | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/app/app.cpp b/src/app/app.cpp index faf4526..4a69655 100644 --- a/src/app/app.cpp +++ b/src/app/app.cpp @@ -1520,7 +1520,16 @@ void CApplication::SetLanguage(Language language) if (locale.empty()) { char *envLang = getenv("LANGUAGE"); - if (strncmp(envLang,"en",2) == 0) + if (envLang == NULL) + { + envLang = getenv("LANG"); + } + if (envLang == NULL) + { + GetLogger()->Error("Failed to get language from environment, setting default language"); + m_language = LANGUAGE_ENGLISH; + } + else if (strncmp(envLang,"en",2) == 0) { m_language = LANGUAGE_ENGLISH; } @@ -1532,7 +1541,7 @@ void CApplication::SetLanguage(Language language) { m_language = LANGUAGE_FRENCH; } - else if (strncmp(envLang,"po",2) == 0) + else if (strncmp(envLang,"pl",2) == 0) { m_language = LANGUAGE_POLISH; } |