diff options
| author | Marcin Zawadzki <zaba.marcin@gmail.com> | 2013-01-05 23:03:26 +0100 |
|---|---|---|
| committer | Piotr Dziwinski <piotrdz@gmail.com> | 2013-01-12 22:49:30 +0100 |
| commit | bfc701e286259d9a7aa2ff8240704eab2ba3a237 (patch) | |
| tree | 6be072452f40c9971291007703c73681c2fa8a3c /src/app/app.cpp | |
| parent | f0a5e81ac41cc8c65b5db6b8637fab385643e261 (diff) | |
| download | colobot-bfc701e286259d9a7aa2ff8240704eab2ba3a237.tar.gz colobot-bfc701e286259d9a7aa2ff8240704eab2ba3a237.tar.bz2 colobot-bfc701e286259d9a7aa2ff8240704eab2ba3a237.zip | |
Small fix in detecting language. Fixes needed to compile code using clang
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 c936ac1..6930920 100644 --- a/src/app/app.cpp +++ b/src/app/app.cpp @@ -1472,7 +1472,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; } @@ -1484,7 +1493,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; } |