From bfc701e286259d9a7aa2ff8240704eab2ba3a237 Mon Sep 17 00:00:00 2001
From: Marcin Zawadzki <zaba.marcin@gmail.com>
Date: Sat, 5 Jan 2013 23:03:26 +0100
Subject: Small fix in detecting language. Fixes needed to compile code using
 clang

---
 CMakeLists.txt                             |  2 +-
 src/CBot/tests/CBot_console/CMakeLists.txt |  1 -
 src/app/app.cpp                            | 13 +++++++++++--
 src/common/test/CMakeLists.txt             |  1 -
 src/graphics/engine/test/CMakeLists.txt    |  1 -
 src/graphics/opengl/test/CMakeLists.txt    |  1 -
 src/math/test/CMakeLists.txt               |  1 -
 src/ui/test/CMakeLists.txt                 |  1 -
 8 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 399ae96..5d0bbeb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -48,7 +48,7 @@ endif()
 
 # Global compile flags
 # These are specific to GCC/MinGW; for other compilers, change as necessary
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wold-style-cast -std=gnu++0x")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wold-style-cast -std=c++11")
 set(CMAKE_CXX_FLAGS_RELEASE "-O2")
 set(CMAKE_CXX_FLAGS_DEBUG "-g -O0")
 
diff --git a/src/CBot/tests/CBot_console/CMakeLists.txt b/src/CBot/tests/CBot_console/CMakeLists.txt
index 9f0f244..f76dedf 100644
--- a/src/CBot/tests/CBot_console/CMakeLists.txt
+++ b/src/CBot/tests/CBot_console/CMakeLists.txt
@@ -8,7 +8,6 @@ if(NOT CMAKE_BUILD_TYPE)
 endif(NOT CMAKE_BUILD_TYPE)
 
 # Global compile flags
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wold-style-cast -std=gnu++0x")
 set(CMAKE_CXX_FLAGS_RELEASE "-O2")
 set(CMAKE_CXX_FLAGS_DEBUG "-g -O0")
 
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;
         }
diff --git a/src/common/test/CMakeLists.txt b/src/common/test/CMakeLists.txt
index 26a31c9..70dac1f 100644
--- a/src/common/test/CMakeLists.txt
+++ b/src/common/test/CMakeLists.txt
@@ -3,7 +3,6 @@ cmake_minimum_required(VERSION 2.8)
 if(NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE debug)
 endif(NOT CMAKE_BUILD_TYPE)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wold-style-cast -std=gnu++0x")
 set(CMAKE_CXX_FLAGS_DEBUG "-g -O0")
 
 include_directories(
diff --git a/src/graphics/engine/test/CMakeLists.txt b/src/graphics/engine/test/CMakeLists.txt
index 46509f4..c837ae5 100644
--- a/src/graphics/engine/test/CMakeLists.txt
+++ b/src/graphics/engine/test/CMakeLists.txt
@@ -3,7 +3,6 @@ cmake_minimum_required(VERSION 2.8)
 if(NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE debug)
 endif(NOT CMAKE_BUILD_TYPE)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wold-style-cast -std=gnu++0x")
 set(CMAKE_CXX_FLAGS_DEBUG "-g -O0")
 
 set(MODELFILE_TEST_SOURCES
diff --git a/src/graphics/opengl/test/CMakeLists.txt b/src/graphics/opengl/test/CMakeLists.txt
index 154fec8..79e0ba5 100644
--- a/src/graphics/opengl/test/CMakeLists.txt
+++ b/src/graphics/opengl/test/CMakeLists.txt
@@ -8,7 +8,6 @@ find_package(PNG REQUIRED)
 if(NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE debug)
 endif(NOT CMAKE_BUILD_TYPE)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wold-style-cast -std=gnu++0x")
 set(CMAKE_CXX_FLAGS_DEBUG "-g -O0")
 
 set(ADD_LIBS "")
diff --git a/src/math/test/CMakeLists.txt b/src/math/test/CMakeLists.txt
index dae4018..e31260c 100644
--- a/src/math/test/CMakeLists.txt
+++ b/src/math/test/CMakeLists.txt
@@ -3,7 +3,6 @@ cmake_minimum_required(VERSION 2.8)
 if(NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE debug)
 endif(NOT CMAKE_BUILD_TYPE)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wold-style-cast -std=gnu++0x")
 set(CMAKE_CXX_FLAGS_DEBUG "-g -O0")
 
 include_directories(
diff --git a/src/ui/test/CMakeLists.txt b/src/ui/test/CMakeLists.txt
index e411067..c38d2bb 100644
--- a/src/ui/test/CMakeLists.txt
+++ b/src/ui/test/CMakeLists.txt
@@ -3,7 +3,6 @@ cmake_minimum_required(VERSION 2.8)
 if(NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE debug)
 endif(NOT CMAKE_BUILD_TYPE)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wold-style-cast -std=gnu++0x")
 set(CMAKE_CXX_FLAGS_DEBUG "-g -O0")
 
 include_directories(
-- 
cgit v1.2.3-1-g7c22