From 0d825ed613ae62b0ed22a7e7f9ea1f001e3f8ea3 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Thu, 27 Dec 2012 16:13:26 +0100
Subject: Fix locale's loading

- Always inherit LC_ALL from environment;
- Enforce environment only if the runtime options require it;
---
 src/app/app.cpp | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/app/app.cpp b/src/app/app.cpp
index 118e100..27adcb1 100644
--- a/src/app/app.cpp
+++ b/src/app/app.cpp
@@ -312,11 +312,14 @@ bool CApplication::Create()
             break;
     }
 
-    std::string langStr = "LANGUAGE=";
-    langStr += locale;
-    strcpy(S_LANGUAGE, langStr.c_str());
-    putenv(S_LANGUAGE);
-    setlocale(LC_ALL, locale.c_str());
+    if (!locale.empty())
+    {
+        std::string langStr = "LANG=";
+        langStr += locale;
+        strcpy(S_LANGUAGE, langStr.c_str());
+        putenv(S_LANGUAGE);
+    }
+    setlocale(LC_ALL, "");
     GetLogger()->Debug("Set locale to '%s'\n", locale.c_str());
 
     bindtextdomain("colobot", COLOBOT_I18N_DIR);
-- 
cgit v1.2.3-1-g7c22