set locales to C because en_US not installed on some systems, only UTF-8 version...

diff --git a/src/gettext.h b/src/gettext.h
index 493f9b21ba09e2bd6c1cce8591a28e10875ff98e..790375165a899e70ecf86e9cfa1cc19daa1d83d8 100644 (file)
--- a/src/gettext.h
+++ b/src/gettext.h
@@ -25,3 +25,13 @@ inline wchar_t* chartowchar_t(const char *str)
        mbstowcs(nstr, str, l);
        return nstr;
 }
+
+inline void changeCtype(const char *l)
+{
+       char *ret = NULL;
+       ret = setlocale(LC_CTYPE, l);
+       if(ret == NULL)
+               std::cout<<"locale could not be set"<<std::endl;
+       else
+               std::cout<<"locale has been set to:"<<ret<<std::endl;
+}

diff --git a/src/guiMainMenu.cpp b/src/guiMainMenu.cpp
index 0365b618ad6e77558df34f4a23fe68191bedca6b..63bc72d2485ac69a847ef49fd27b5624772c049c 100644 (file)
--- a/src/guiMainMenu.cpp
+++ b/src/guiMainMenu.cpp
@@ -164,7 +164,7 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
        v2s32 topleft_client(40, 0);
        v2s32 size_client = size - v2s32(40, 0);
        
-       setlocale(LC_CTYPE, "");
+       changeCtype("");
        {
                core::rect<s32> rect(0, 0, 20, 125);
                rect += topleft_client + v2s32(-15, 60);
@@ -181,7 +181,7 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
                Environment->addStaticText(chartowchar_t(gettext("Name/Password")), 
                        rect, false, true, this, -1);
        }
-       setlocale(LC_CTYPE, "en_US");
+       changeCtype("C");
        {
                core::rect<s32> rect(0, 0, 230, 30);
                rect += topleft_client + v2s32(160, 50);
@@ -198,7 +198,7 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
                e->setPasswordBox(true);
 
        }
-       setlocale(LC_CTYPE, "");
+       changeCtype("");
        // Address + port
        {
                core::rect<s32> rect(0, 0, 110, 20);
@@ -206,7 +206,7 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
                Environment->addStaticText(chartowchar_t(gettext("Address/Port")),
                        rect, false, true, this, -1);
        }
-       setlocale(LC_CTYPE, "en_US");
+       changeCtype("C");
        {
                core::rect<s32> rect(0, 0, 230, 30);
                rect += topleft_client + v2s32(160, 100);
@@ -221,7 +221,7 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
                rect += topleft_client + v2s32(size_client.X-60-100, 100);
                Environment->addEditBox(text_port.c_str(), rect, true, this, GUI_ID_PORT_INPUT);
        }
-       setlocale(LC_CTYPE, "");
+       changeCtype("");
        {
                core::rect<s32> rect(0, 0, 400, 20);
                rect += topleft_client + v2s32(160, 100+35);
@@ -294,7 +294,7 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
                Environment->addButton(rect, this, GUI_ID_DELETE_MAP_BUTTON,
                          chartowchar_t(gettext("Delete map")));
        }
-       setlocale(LC_CTYPE, "en_US");
+       changeCtype("C");
 }
 
 void GUIMainMenu::drawMenu()

diff --git a/src/guiMessageMenu.cpp b/src/guiMessageMenu.cpp
index b03f87b31f158095312d4a4700d955907e4b66f0..27ff3dafab7b24e89b4c16b90fe0297bdca22001 100644 (file)
--- a/src/guiMessageMenu.cpp
+++ b/src/guiMessageMenu.cpp
@@ -85,7 +85,7 @@ void GUIMessageMenu::regenerateGui(v2u32 screensize)
                Environment->addStaticText(m_message_text.c_str(), rect, false,
                                true, this, 256);
        }
-       setlocale(LC_CTYPE, "");
+       changeCtype("");
        {
                core::rect<s32> rect(0, 0, 140, 30);
                rect = rect + v2s32(size.X/2-140/2, size.Y/2-30/2+25);
@@ -94,7 +94,7 @@ void GUIMessageMenu::regenerateGui(v2u32 screensize)
                        chartowchar_t(gettext("Proceed")));
                Environment->setFocus(e);
        }
-       setlocale(LC_CTYPE, "en_US");
+       changeCtype("en_US.UTF-8");
 }
 
 void GUIMessageMenu::drawMenu()

diff --git a/src/guiPasswordChange.cpp b/src/guiPasswordChange.cpp
index 89a6ce682be3fbc0f5e3d1118fcb41d62479196b..2a7fb009a02db28c2998177837947e8927024bc5 100644 (file)
--- a/src/guiPasswordChange.cpp
+++ b/src/guiPasswordChange.cpp
@@ -96,14 +96,14 @@ void GUIPasswordChange::regenerateGui(v2u32 screensize)
                Add stuff
        */
        s32 ypos = 50;
-       setlocale(LC_CTYPE, "");
+       changeCtype("");
        {
                core::rect<s32> rect(0, 0, 110, 20);
                rect += topleft_client + v2s32(35, ypos+6);
                Environment->addStaticText(chartowchar_t(gettext("Old Password")),
                        rect, false, true, this, -1);
        }
-       setlocale(LC_CTYPE, "en_US");
+       changeCtype("C");
        {
                core::rect<s32> rect(0, 0, 230, 30);
                rect += topleft_client + v2s32(160, ypos);
@@ -113,14 +113,14 @@ void GUIPasswordChange::regenerateGui(v2u32 screensize)
                e->setPasswordBox(true);
        }
        ypos += 50;
-       setlocale(LC_CTYPE, "");
+       changeCtype("");
        {
                core::rect<s32> rect(0, 0, 110, 20);
                rect += topleft_client + v2s32(35, ypos+6);
                Environment->addStaticText(chartowchar_t(gettext("New Password")),
                        rect, false, true, this, -1);
        }
-       setlocale(LC_CTYPE, "en_US");
+       changeCtype("C");
        {
                core::rect<s32> rect(0, 0, 230, 30);
                rect += topleft_client + v2s32(160, ypos);
@@ -129,14 +129,14 @@ void GUIPasswordChange::regenerateGui(v2u32 screensize)
                e->setPasswordBox(true);
        }
        ypos += 50;
-       setlocale(LC_CTYPE, "");
+       changeCtype("");
        {
                core::rect<s32> rect(0, 0, 110, 20);
                rect += topleft_client + v2s32(35, ypos+6);
                Environment->addStaticText(chartowchar_t(gettext("Confirm Password")),
                        rect, false, true, this, -1);
        }
-       setlocale(LC_CTYPE, "en_US");
+       changeCtype("C");
        {
                core::rect<s32> rect(0, 0, 230, 30);
                rect += topleft_client + v2s32(160, ypos);
@@ -146,7 +146,7 @@ void GUIPasswordChange::regenerateGui(v2u32 screensize)
        }
 
        ypos += 50;
-       setlocale(LC_CTYPE, "");
+       changeCtype("");
        {
                core::rect<s32> rect(0, 0, 140, 30);
                rect = rect + v2s32(size.X/2-140/2, ypos);
@@ -163,7 +163,7 @@ void GUIPasswordChange::regenerateGui(v2u32 screensize)
                        rect, false, true, this, ID_message);
                e->setVisible(false);
        }
-       setlocale(LC_CTYPE, "en_US");
+       changeCtype("C");
 
 }
 

diff --git a/src/guiPauseMenu.cpp b/src/guiPauseMenu.cpp
index 3a5d245bcf99f5cf8ba6542db6f39e9632769fb3..6cf364e5f6d8b3ee4ede2c9ee4ed3368f38d569f 100644 (file)
--- a/src/guiPauseMenu.cpp
+++ b/src/guiPauseMenu.cpp
@@ -103,7 +103,7 @@ void GUIPauseMenu::regenerateGui(v2u32 screensize)
        const s32 btn_gap = 20;\r
        const s32 btn_num = 4;\r
        s32 btn_y = size.Y/2-((btn_num*btn_height+(btn_num-1)*btn_gap))/2;\r
-       setlocale(LC_CTYPE, "");\r
+       changeCtype("");\r
        {\r
                core::rect<s32> rect(0, 0, 140, btn_height);\r
                rect = rect + v2s32(size.X/2-140/2, btn_y);\r
@@ -181,7 +181,7 @@ void GUIPauseMenu::regenerateGui(v2u32 screensize)
        \r
                Environment->addStaticText(narrow_to_wide(os.str()).c_str(), rect, false, true, this, 259);\r
        }\r
-       setlocale(LC_CTYPE, "en_US");\r
+       changeCtype("C");\r
 }\r
 \r
 void GUIPauseMenu::drawMenu()\r

diff --git a/src/guiTextInputMenu.cpp b/src/guiTextInputMenu.cpp
index 8c32490be4f3139bfb3d82e230a7d7fd82b573a9..a596025541eaea084aaa3ffcfa4f4c721576d987 100644 (file)
--- a/src/guiTextInputMenu.cpp
+++ b/src/guiTextInputMenu.cpp
@@ -104,14 +104,14 @@ void GUITextInputMenu::regenerateGui(v2u32 screensize)
                Environment->addEditBox(text.c_str(), rect, true, this, 256);
                Environment->setFocus(e);
        }
-       setlocale(LC_CTYPE, "");
+       changeCtype("");
        {
                core::rect<s32> rect(0, 0, 140, 30);
                rect = rect + v2s32(size.X/2-140/2, size.Y/2-30/2+25);
                Environment->addButton(rect, this, 257,
                        chartowchar_t(gettext("Proceed")));
        }
-       setlocale(LC_CTYPE, "en_US");
+       changeCtype("C");
 }
 
 void GUITextInputMenu::drawMenu()