BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

fixed displaying "umlauts" (deutsch umlaute) and hopefully other non ASCII chars, too

Browse Source
This commit is contained in:
Constantin Wenger 2011-07-29 23:33:33 +02:00
parent 17830c5894
commit 92f504f98d
5 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/guiMainMenu.cpp
View File

@ -164,6 +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, "");
{ {
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);
@ -180,6 +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");
{ {
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);
@ -196,6 +198,7 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
e->setPasswordBox(true); e->setPasswordBox(true);
} }
setlocale(LC_CTYPE, "");
// Address + port // Address + port
{ {
core::rect<s32> rect(0, 0, 110, 20); core::rect<s32> rect(0, 0, 110, 20);
@ -203,6 +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");
{ {
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);
@ -217,6 +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, "");
{ {
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);
@ -289,6 +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");
} }
void GUIMainMenu::drawMenu() void GUIMainMenu::drawMenu()

2
src/guiMessageMenu.cpp
View File

@ -85,6 +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, "");
{ {
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);
@ -93,6 +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");
} }
void GUIMessageMenu::drawMenu() void GUIMessageMenu::drawMenu()

8
src/guiPasswordChange.cpp
View File

@ -96,12 +96,14 @@ void GUIPasswordChange::regenerateGui(v2u32 screensize)
Add stuff Add stuff
*/ */
s32 ypos = 50; s32 ypos = 50;
setlocale(LC_CTYPE, "");
{ {
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");
{ {
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);
@ -111,12 +113,14 @@ void GUIPasswordChange::regenerateGui(v2u32 screensize)
e->setPasswordBox(true); e->setPasswordBox(true);
} }
ypos += 50; ypos += 50;
setlocale(LC_CTYPE, "");
{ {
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");
{ {
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);
@ -125,12 +129,14 @@ void GUIPasswordChange::regenerateGui(v2u32 screensize)
e->setPasswordBox(true); e->setPasswordBox(true);
} }
ypos += 50; ypos += 50;
setlocale(LC_CTYPE, "");
{ {
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");
{ {
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);
@ -140,6 +146,7 @@ void GUIPasswordChange::regenerateGui(v2u32 screensize)
} }
ypos += 50; ypos += 50;
setlocale(LC_CTYPE, "");
{ {
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);
@ -156,6 +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");
} }

2
src/guiPauseMenu.cpp
View File

@ -103,6 +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, "");
{ {
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);
@ -180,6 +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");
} }
void GUIPauseMenu::drawMenu() void GUIPauseMenu::drawMenu()

2
src/guiTextInputMenu.cpp
View File

@ -104,12 +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, "");
{ {
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");
} }
void GUITextInputMenu::drawMenu() void GUITextInputMenu::drawMenu()