From 745dca819d026690037a56f6d81958b968e5a822 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sat, 12 Nov 2011 20:25:48 +0300
Subject: Fix custom language selection in some linuxes.

---
 src/client.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'src/client.cpp')

diff --git a/src/client.cpp b/src/client.cpp
index 62f8ae504..8a6ec2116 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -294,7 +294,7 @@ Client::Client(const Options &options):
 #if ENABLE_NLS
     std::string lang = config.getValue("lang", "");
 #ifdef WIN32
-    if (lang == "")
+    if (!lang.empty())
         lang = std::string(_nl_locale_name_default());
 
     putenv((char*)("LANG=" + lang).c_str());
@@ -303,6 +303,11 @@ Client::Client(const Options &options):
     if (lang != "C")
         bindtextdomain("manaplus", "translations/");
 #else
+    if (!lang.empty())
+    {
+        putenv(const_cast<char*>(("LANG=" + lang).c_str()));
+        putenv(const_cast<char*>(("LANGUAGE=" + lang).c_str()));
+    }
 #ifdef ENABLE_PORTABLE
     bindtextdomain("manaplus", (std::string(PHYSFS_getBaseDir())
         + "../locale/").c_str());
-- 
cgit v1.2.3-60-g2f50