An0n3m0us
/
Minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

master
Constantin Wenger 2011-07-30 10:14:58 +02:00
parent 92f504f98d
commit 9baae3a701
6 changed files with 30 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/gettext.h
View File

@ -25,3 +25,13 @@ inline wchar_t* chartowchar_t(const char *str)
mbstowcs(nstr, str, l); mbstowcs(nstr, str, l);
return nstr; 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;
}

12
src/guiMainMenu.cpp
View File

@ -164,7 +164,7 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
v2s32 topleft_client(40, 0); v2s32 topleft_client(40, 0);
v2s32 size_client = size - v2s32(40, 0); v2s32 size_client = size - v2s32(40, 0);
setlocale(LC_CTYPE, ""); changeCtype("");
{ {
core::rect<s32> rect(0, 0, 20, 125); core::rect<s32> rect(0, 0, 20, 125);
rect += topleft_client + v2s32(-15, 60); rect += topleft_client + v2s32(-15, 60);
@ -181,7 +181,7 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
Environment->addStaticText(chartowchar_t(gettext("Name/Password")), Environment->addStaticText(chartowchar_t(gettext("Name/Password")),
rect, false, true, this, -1); rect, false, true, this, -1);
} }
setlocale(LC_CTYPE, "en_US"); changeCtype("C");
{ {
core::rect<s32> rect(0, 0, 230, 30); core::rect<s32> rect(0, 0, 230, 30);
rect += topleft_client + v2s32(160, 50); rect += topleft_client + v2s32(160, 50);
@ -198,7 +198,7 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
e->setPasswordBox(true); e->setPasswordBox(true);
} }
setlocale(LC_CTYPE, ""); changeCtype("");
// Address + port // Address + port
{ {
core::rect<s32> rect(0, 0, 110, 20); core::rect<s32> rect(0, 0, 110, 20);
@ -206,7 +206,7 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
Environment->addStaticText(chartowchar_t(gettext("Address/Port")), Environment->addStaticText(chartowchar_t(gettext("Address/Port")),
rect, false, true, this, -1); rect, false, true, this, -1);
} }
setlocale(LC_CTYPE, "en_US"); changeCtype("C");
{ {
core::rect<s32> rect(0, 0, 230, 30); core::rect<s32> rect(0, 0, 230, 30);
rect += topleft_client + v2s32(160, 100); 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); rect += topleft_client + v2s32(size_client.X-60-100, 100);
Environment->addEditBox(text_port.c_str(), rect, true, this, GUI_ID_PORT_INPUT); 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); core::rect<s32> rect(0, 0, 400, 20);
rect += topleft_client + v2s32(160, 100+35); 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, Environment->addButton(rect, this, GUI_ID_DELETE_MAP_BUTTON,
chartowchar_t(gettext("Delete map"))); chartowchar_t(gettext("Delete map")));
} }
setlocale(LC_CTYPE, "en_US"); changeCtype("C");
} }
void GUIMainMenu::drawMenu() void GUIMainMenu::drawMenu()

4
src/guiMessageMenu.cpp
View File

@ -85,7 +85,7 @@ void GUIMessageMenu::regenerateGui(v2u32 screensize)
Environment->addStaticText(m_message_text.c_str(), rect, false, Environment->addStaticText(m_message_text.c_str(), rect, false,
true, this, 256); true, this, 256);
} }
setlocale(LC_CTYPE, ""); changeCtype("");
{ {
core::rect<s32> rect(0, 0, 140, 30); core::rect<s32> rect(0, 0, 140, 30);
rect = rect + v2s32(size.X/2-140/2, size.Y/2-30/2+25); 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"))); chartowchar_t(gettext("Proceed")));
Environment->setFocus(e); Environment->setFocus(e);
} }
setlocale(LC_CTYPE, "en_US"); changeCtype("en_US.UTF-8");
} }
void GUIMessageMenu::drawMenu() void GUIMessageMenu::drawMenu()

16
src/guiPasswordChange.cpp
View File

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

4
src/guiPauseMenu.cpp
View File

@ -103,7 +103,7 @@ void GUIPauseMenu::regenerateGui(v2u32 screensize)
const s32 btn_gap = 20; const s32 btn_gap = 20;
const s32 btn_num = 4; const s32 btn_num = 4;
s32 btn_y = size.Y/2-((btn_num*btn_height+(btn_num-1)*btn_gap))/2; s32 btn_y = size.Y/2-((btn_num*btn_height+(btn_num-1)*btn_gap))/2;
setlocale(LC_CTYPE, ""); changeCtype("");
{ {
core::rect<s32> rect(0, 0, 140, btn_height); core::rect<s32> rect(0, 0, 140, btn_height);
rect = rect + v2s32(size.X/2-140/2, btn_y); rect = rect + v2s32(size.X/2-140/2, btn_y);
@ -181,7 +181,7 @@ void GUIPauseMenu::regenerateGui(v2u32 screensize)
Environment->addStaticText(narrow_to_wide(os.str()).c_str(), rect, false, true, this, 259); Environment->addStaticText(narrow_to_wide(os.str()).c_str(), rect, false, true, this, 259);
} }
setlocale(LC_CTYPE, "en_US"); changeCtype("C");
} }
void GUIPauseMenu::drawMenu() void GUIPauseMenu::drawMenu()

4
src/guiTextInputMenu.cpp
View File

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