From f4c6f49b2fd01de2d6daff5ec1b9c181c39d09b7 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Fri, 28 Dec 2012 22:31:47 +0100
Subject: Move language initialisation in SetLanguage

---
 src/app/app.cpp | 90 ++++++++++++++++++++++++++++++---------------------------
 1 file changed, 48 insertions(+), 42 deletions(-)

(limited to 'src/app/app.cpp')

diff --git a/src/app/app.cpp b/src/app/app.cpp
index 4d32de3..32f68e1 100644
--- a/src/app/app.cpp
+++ b/src/app/app.cpp
@@ -285,48 +285,7 @@ bool CApplication::Create()
         return false;
     }
 
-    /* Gettext initialization */
-
-    std::string locale = "";
-    switch (m_language)
-    {
-        default:
-        case LANGUAGE_ENV:
-            locale = "";
-            break;
-
-        case LANGUAGE_ENGLISH:
-            locale = "en_US.utf8";
-            break;
-
-        case LANGUAGE_GERMAN:
-            locale = "de_DE.utf8";
-            break;
-
-        case LANGUAGE_FRENCH:
-            locale = "fr_FR.utf8";
-            break;
-
-        case LANGUAGE_POLISH:
-            locale = "pl_PL.utf8";
-            break;
-    }
-
-    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);
-    bind_textdomain_codeset("colobot", "UTF-8");
-    textdomain("colobot");
-
-    GetLogger()->Debug("Testing gettext translation: '%s'\n", gettext("Colobot rules!"));
+    SetLanguage(m_language);
 
     //Create the sound instance.
     if (!GetProfile().InitCurrentDirectory())
@@ -1456,6 +1415,53 @@ Language CApplication::GetLanguage()
 void CApplication::SetLanguage(Language language)
 {
     m_language = language;
+
+    /* Gettext initialization */
+
+    std::string locale = "";
+    switch (m_language)
+    {
+        default:
+        case LANGUAGE_ENV:
+            locale = "";
+            break;
+
+        case LANGUAGE_ENGLISH:
+            locale = "en_US.utf8";
+            break;
+
+        case LANGUAGE_GERMAN:
+            locale = "de_DE.utf8";
+            break;
+
+        case LANGUAGE_FRENCH:
+            locale = "fr_FR.utf8";
+            break;
+
+        case LANGUAGE_POLISH:
+            locale = "pl_PL.utf8";
+            break;
+    }
+
+    if (locale.empty())
+    {
+        GetLogger()->Trace("SetLanguage: Inherit LANGUAGE=%s from environment\n", getenv("LANGUAGE"));
+    }
+    else
+    {
+        std::string langStr = "LANGUAGE=";
+        langStr += locale;
+        strcpy(S_LANGUAGE, langStr.c_str());
+        putenv(S_LANGUAGE);
+        GetLogger()->Trace("SetLanguage: Set LANGUAGE=%s in environment\n", locale.c_str());
+    }
+    setlocale(LC_ALL, "");
+
+    bindtextdomain("colobot", COLOBOT_I18N_DIR);
+    bind_textdomain_codeset("colobot", "UTF-8");
+    textdomain("colobot");
+
+    GetLogger()->Debug("SetLanguage: Test gettext translation: '%s'\n", gettext("Colobot rules!"));
 }
 
 void CApplication::SetLowCPU(bool low)
-- 
cgit v1.2.3-1-g7c22


From 1b4208cdc5143cfc8f46da063a1a991795d7f307 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Fri, 28 Dec 2012 23:06:12 +0100
Subject: Implement language Char for level files

This currently lacks fallback to an existing entry for non-translated entries
---
 src/app/app.cpp | 45 ++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 44 insertions(+), 1 deletion(-)

(limited to 'src/app/app.cpp')

diff --git a/src/app/app.cpp b/src/app/app.cpp
index 32f68e1..1e577ca 100644
--- a/src/app/app.cpp
+++ b/src/app/app.cpp
@@ -1412,6 +1412,32 @@ Language CApplication::GetLanguage()
     return m_language;
 }
 
+char CApplication::GetLanguageChar()
+{
+    char langChar = 'E';
+    switch (m_language)
+    {
+        default:
+        case LANGUAGE_ENV:
+        case LANGUAGE_ENGLISH:
+            langChar = 'E';
+            break;
+
+        case LANGUAGE_GERMAN:
+            langChar = 'D';
+            break;
+
+        case LANGUAGE_FRENCH:
+            langChar = 'F';
+            break;
+
+        case LANGUAGE_POLISH:
+            langChar = 'P';
+            break;
+    }
+    return langChar;
+}
+
 void CApplication::SetLanguage(Language language)
 {
     m_language = language;
@@ -1445,7 +1471,24 @@ void CApplication::SetLanguage(Language language)
 
     if (locale.empty())
     {
-        GetLogger()->Trace("SetLanguage: Inherit LANGUAGE=%s from environment\n", getenv("LANGUAGE"));
+        char *envLang = getenv("LANGUAGE");
+        if (strncmp(envLang,"en",2) == 0)
+        {
+           m_language = LANGUAGE_ENGLISH;
+        }
+        else if (strncmp(envLang,"de",2) == 0)
+        {
+           m_language = LANGUAGE_GERMAN;
+        }
+        else if (strncmp(envLang,"fr",2) == 0)
+        {
+           m_language = LANGUAGE_FRENCH;
+        }
+        else if (strncmp(envLang,"po",2) == 0)
+        {
+           m_language = LANGUAGE_POLISH;
+        }
+        GetLogger()->Trace("SetLanguage: Inherit LANGUAGE=%s from environment\n", envLang);
     }
     else
     {
-- 
cgit v1.2.3-1-g7c22