Use wgettext

diff --git a/src/guiKeyChangeMenu.cpp b/src/guiKeyChangeMenu.cpp
index ffc676603b10e2d7fc30df0040e915510228b9da..6e41677ce33b21d234ca1c441cc459374769d9ff 100644 (file)
--- a/src/guiKeyChangeMenu.cpp
+++ b/src/guiKeyChangeMenu.cpp
@@ -81,7 +81,7 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)
                core::rect < s32 > rect(0, 0, 125, 20);
                rect += topleft + v2s32(25, 3);
                //gui::IGUIStaticText *t =
-               Environment->addStaticText(chartowchar_t(gettext("KEYBINDINGS")),
+               Environment->addStaticText(wgettext("KEYBINDINGS"),
                                rect, false, true, this, -1);
                //t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_UPPERLEFT);
        }
@@ -91,7 +91,7 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)
        {
                core::rect < s32 > rect(0, 0, 100, 20);
                rect += topleft + v2s32(offset.X, offset.Y);
-               Environment->addStaticText(chartowchar_t(gettext("Forward")),
+               Environment->addStaticText(wgettext("Forward"),
                                rect, false, true, this, -1);
                //t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_UPPERLEFT);
        }
@@ -108,7 +108,7 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)
        {
                core::rect < s32 > rect(0, 0, 100, 20);
                rect += topleft + v2s32(offset.X, offset.Y);
-               Environment->addStaticText(chartowchar_t(gettext("Backward")),
+               Environment->addStaticText(wgettext("Backward"),
                                rect, false, true, this, -1);
                //t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_UPPERLEFT);
        }
@@ -124,7 +124,7 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)
        {
                core::rect < s32 > rect(0, 0, 100, 20);
                rect += topleft + v2s32(offset.X, offset.Y);
-               Environment->addStaticText(chartowchar_t(gettext("Left")),
+               Environment->addStaticText(wgettext("Left"),
                                rect, false, true, this, -1);
                //t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_UPPERLEFT);
        }
@@ -139,7 +139,7 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)
        {
                core::rect < s32 > rect(0, 0, 100, 20);
                rect += topleft + v2s32(offset.X, offset.Y);
-               Environment->addStaticText(chartowchar_t(gettext("Right")),
+               Environment->addStaticText(wgettext("Right"),
                                rect, false, true, this, -1);
                //t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_UPPERLEFT);
        }
@@ -155,7 +155,7 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)
        {
                core::rect < s32 > rect(0, 0, 100, 20);
                rect += topleft + v2s32(offset.X, offset.Y);
-               Environment->addStaticText(chartowchar_t(gettext("Use")),
+               Environment->addStaticText(wgettext("Use"),
                                rect, false, true, this, -1);
                //t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_UPPERLEFT);
        }
@@ -170,7 +170,7 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)
        {
                core::rect < s32 > rect(0, 0, 100, 20);
                rect += topleft + v2s32(offset.X, offset.Y);
-               Environment->addStaticText(chartowchar_t(gettext("Sneak")),
+               Environment->addStaticText(wgettext("Sneak"),
                                rect, false, true, this, -1);
                //t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_UPPERLEFT);
        }
@@ -186,7 +186,7 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)
        {
                core::rect < s32 > rect(0, 0, 100, 20);
                rect += topleft + v2s32(offset.X, offset.Y);
-               Environment->addStaticText(chartowchar_t(gettext("Jump")), rect, false, true, this, -1);
+               Environment->addStaticText(wgettext("Jump"), rect, false, true, this, -1);
                //t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_UPPERLEFT);
        }
 
@@ -201,7 +201,7 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)
        {
                core::rect < s32 > rect(0, 0, 100, 20);
                rect += topleft + v2s32(offset.X, offset.Y);
-               Environment->addStaticText(chartowchar_t(gettext("Inventory")),
+               Environment->addStaticText(wgettext("Inventory"),
                                rect, false, true, this, -1);
                //t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_UPPERLEFT);
        }
@@ -217,7 +217,7 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)
        {
                core::rect < s32 > rect(0, 0, 100, 20);
                rect += topleft + v2s32(offset.X, offset.Y);
-               Environment->addStaticText(chartowchar_t(gettext("Chat")), rect, false, true, this, -1);
+               Environment->addStaticText(wgettext("Chat"), rect, false, true, this, -1);
                //t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_UPPERLEFT);
        }
 
@@ -233,7 +233,7 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)
        {
                core::rect < s32 > rect(0, 0, 100, 20);
                rect += topleft + v2s32(offset.X, offset.Y);
-               Environment->addStaticText(chartowchar_t(gettext("Toggle fly")),
+               Environment->addStaticText(wgettext("Toggle fly"),
                                rect, false, true, this, -1);
                //t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_UPPERLEFT);
        }
@@ -248,7 +248,7 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)
        {
                core::rect < s32 > rect(0, 0, 100, 20);
                rect += topleft + v2s32(offset.X, offset.Y);
-               Environment->addStaticText(chartowchar_t(gettext("Toggle fast")),
+               Environment->addStaticText(wgettext("Toggle fast"),
                                rect, false, true, this, -1);
                //t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_UPPERLEFT);
        }
@@ -263,7 +263,7 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)
        {
                core::rect < s32 > rect(0, 0, 100, 20);
                rect += topleft + v2s32(offset.X, offset.Y);
-               Environment->addStaticText(chartowchar_t(gettext("Range select")),
+               Environment->addStaticText(wgettext("Range select"),
                                rect, false, true, this, -1);
                //t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_UPPERLEFT);
        }
@@ -280,7 +280,7 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)
        {
                core::rect < s32 > rect(0, 0, 100, 20);
                rect += topleft + v2s32(offset.X, offset.Y);
-               Environment->addStaticText(chartowchar_t(gettext("Print stacks")),
+               Environment->addStaticText(wgettext("Print stacks"),
                                rect, false, true, this, -1);
                //t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_UPPERLEFT);
        }
@@ -295,13 +295,13 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)
                core::rect < s32 > rect(0, 0, 100, 30);
                rect += topleft + v2s32(size.X - 100 - 20, size.Y - 40);
                Environment->addButton(rect, this, GUI_ID_BACK_BUTTON,
-               chartowchar_t(gettext("Save")));
+               wgettext("Save"));
        }
        {
                core::rect < s32 > rect(0, 0, 100, 30);
                rect += topleft + v2s32(size.X - 100 - 20 - 100 - 20, size.Y - 40);
                Environment->addButton(rect, this, GUI_ID_ABORT_BUTTON,
-               chartowchar_t(gettext("Cancel")));
+               wgettext("Cancel"));
        }
 }
 
@@ -526,67 +526,67 @@ bool GUIKeyChangeMenu::OnEvent(const SEvent& event)
                        case GUI_ID_KEY_FORWARD_BUTTON:
                                resetMenu();
                                activeKey = event.GUIEvent.Caller->getID();
-                               this->forward->setText(chartowchar_t(gettext("press Key")));
+                               this->forward->setText(wgettext("press Key"));
                                break;
                        case GUI_ID_KEY_BACKWARD_BUTTON:
                                resetMenu();
                                activeKey = event.GUIEvent.Caller->getID();
-                               this->backward->setText(chartowchar_t(gettext("press Key")));
+                               this->backward->setText(wgettext("press Key"));
                                break;
                        case GUI_ID_KEY_LEFT_BUTTON:
                                resetMenu();
                                activeKey = event.GUIEvent.Caller->getID();
-                               this->left->setText(chartowchar_t(gettext("press Key")));
+                               this->left->setText(wgettext("press Key"));
                                break;
                        case GUI_ID_KEY_RIGHT_BUTTON:
                                resetMenu();
                                activeKey = event.GUIEvent.Caller->getID();
-                               this->right->setText(chartowchar_t(gettext("press Key")));
+                               this->right->setText(wgettext("press Key"));
                                break;
                        case GUI_ID_KEY_USE_BUTTON:
                                resetMenu();
                                activeKey = event.GUIEvent.Caller->getID();
-                               this->use->setText(chartowchar_t(gettext("press Key")));
+                               this->use->setText(wgettext("press Key"));
                                break;
                        case GUI_ID_KEY_FLY_BUTTON:
                                resetMenu();
                                activeKey = event.GUIEvent.Caller->getID();
-                               this->fly->setText(chartowchar_t(gettext("press Key")));
+                               this->fly->setText(wgettext("press Key"));
                                break;
                        case GUI_ID_KEY_FAST_BUTTON:
                                resetMenu();
                                activeKey = event.GUIEvent.Caller->getID();
-                               this->fast->setText(chartowchar_t(gettext("press Key")));
+                               this->fast->setText(wgettext("press Key"));
                                break;
                        case GUI_ID_KEY_JUMP_BUTTON:
                                resetMenu();
                                activeKey = event.GUIEvent.Caller->getID();
-                               this->jump->setText(chartowchar_t(gettext("press Key")));
+                               this->jump->setText(wgettext("press Key"));
                                break;
                        case GUI_ID_KEY_CHAT_BUTTON:
                                resetMenu();
                                activeKey = event.GUIEvent.Caller->getID();
-                               this->chat->setText(chartowchar_t(gettext("press Key")));
+                               this->chat->setText(wgettext("press Key"));
                                break;
                        case GUI_ID_KEY_SNEAK_BUTTON:
                                resetMenu();
                                activeKey = event.GUIEvent.Caller->getID();
-                               this->sneak->setText(chartowchar_t(gettext("press Key")));
+                               this->sneak->setText(wgettext("press Key"));
                                break;
                        case GUI_ID_KEY_INVENTORY_BUTTON:
                                resetMenu();
                                activeKey = event.GUIEvent.Caller->getID();
-                               this->inventory->setText(chartowchar_t(gettext("press Key")));
+                               this->inventory->setText(wgettext("press Key"));
                                break;
                        case GUI_ID_KEY_DUMP_BUTTON:
                                resetMenu();
                                activeKey = event.GUIEvent.Caller->getID();
-                               this->dump->setText(chartowchar_t(gettext("press Key")));
+                               this->dump->setText(wgettext("press Key"));
                                break;
                        case GUI_ID_KEY_RANGE_BUTTON:
                                resetMenu();
                                activeKey = event.GUIEvent.Caller->getID();
-                               this->range->setText(chartowchar_t(gettext("press Key")));
+                               this->range->setText(wgettext("press Key"));
                                break;
                        }
                        //Buttons

diff --git a/src/guiMainMenu.cpp b/src/guiMainMenu.cpp
index 63bc72d2485ac69a847ef49fd27b5624772c049c..2d5bd151acadd87fcb84f0f436e076fb2a1f90b1 100644 (file)
--- a/src/guiMainMenu.cpp
+++ b/src/guiMainMenu.cpp
@@ -178,7 +178,7 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
        {
                core::rect<s32> rect(0, 0, 110, 20);
                rect += topleft_client + v2s32(35, 50+6);
-               Environment->addStaticText(chartowchar_t(gettext("Name/Password")), 
+               Environment->addStaticText(wgettext("Name/Password"), 
                        rect, false, true, this, -1);
        }
        changeCtype("C");
@@ -203,7 +203,7 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
        {
                core::rect<s32> rect(0, 0, 110, 20);
                rect += topleft_client + v2s32(35, 100+6);
-               Environment->addStaticText(chartowchar_t(gettext("Address/Port")),
+               Environment->addStaticText(wgettext("Address/Port"),
                        rect, false, true, this, -1);
        }
        changeCtype("C");
@@ -225,20 +225,20 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
        {
                core::rect<s32> rect(0, 0, 400, 20);
                rect += topleft_client + v2s32(160, 100+35);
-               Environment->addStaticText(chartowchar_t(gettext("Leave address blank to start a local server.")),
+               Environment->addStaticText(wgettext("Leave address blank to start a local server."),
                        rect, false, true, this, -1);
        }
        {
                core::rect<s32> rect(0, 0, 250, 30);
                rect += topleft_client + v2s32(35, 150);
                Environment->addCheckBox(fancy_trees, rect, this, GUI_ID_FANCYTREE_CB,
-                       chartowchar_t(gettext("Fancy trees"))); 
+                       wgettext("Fancy trees")); 
        }
        {
                core::rect<s32> rect(0, 0, 250, 30);
                rect += topleft_client + v2s32(35, 150+30);
                Environment->addCheckBox(smooth_lighting, rect, this, GUI_ID_SMOOTH_LIGHTING_CB,
-                               chartowchar_t(gettext("Smooth Lighting")));
+                               wgettext("Smooth Lighting"));
        }
        // Start game button
        {
@@ -246,7 +246,7 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
                //rect += topleft_client + v2s32(size_client.X/2-180/2, 225-30/2);
                rect += topleft_client + v2s32(size_client.X-180-40, 150+25);
                Environment->addButton(rect, this, GUI_ID_JOIN_GAME_BUTTON,
-                       chartowchar_t(gettext("Start Game / Connect")));
+                       wgettext("Start Game / Connect"));
        }
 
        // Key change button
@@ -255,7 +255,7 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
                //rect += topleft_client + v2s32(size_client.X/2-180/2, 225-30/2);
                rect += topleft_client + v2s32(size_client.X-180-40-100-20, 150+25);
                Environment->addButton(rect, this, GUI_ID_CHANGE_KEYS_BUTTON,
-                       chartowchar_t(gettext("Change keys")));
+                       wgettext("Change keys"));
        }
        /*
                Server section
@@ -278,13 +278,13 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
                core::rect<s32> rect(0, 0, 250, 30);
                rect += topleft_server + v2s32(35, 30);
                Environment->addCheckBox(creative_mode, rect, this, GUI_ID_CREATIVE_CB,
-                       chartowchar_t(gettext("Creative Mode")));
+                       wgettext("Creative Mode"));
        }
        {
                core::rect<s32> rect(0, 0, 250, 30);
                rect += topleft_server + v2s32(35, 60);
                Environment->addCheckBox(enable_damage, rect, this, GUI_ID_DAMAGE_CB,
-                       chartowchar_t(gettext("Enable Damage")));
+                       wgettext("Enable Damage"));
        }
        // Map delete button
        {
@@ -292,7 +292,7 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
                //rect += topleft_server + v2s32(size_server.X-40-130, 100+25);
                rect += topleft_server + v2s32(40, 100+25);
                Environment->addButton(rect, this, GUI_ID_DELETE_MAP_BUTTON,
-                         chartowchar_t(gettext("Delete map")));
+                         wgettext("Delete map"));
        }
        changeCtype("C");
 }

diff --git a/src/guiMessageMenu.cpp b/src/guiMessageMenu.cpp
index 71c8fd1e88eda7d7bc0013dafd49073aa076019c..14b360708a8439a6806e0de8e7b18ead983002fb 100644 (file)
--- a/src/guiMessageMenu.cpp
+++ b/src/guiMessageMenu.cpp
@@ -91,7 +91,7 @@ void GUIMessageMenu::regenerateGui(v2u32 screensize)
                rect = rect + v2s32(size.X/2-140/2, size.Y/2-30/2+25);
                gui::IGUIElement *e = 
                Environment->addButton(rect, this, 257,
-                       chartowchar_t(gettext("Proceed")));
+                       wgettext("Proceed"));
                Environment->setFocus(e);
        }
        changeCtype("C");

diff --git a/src/guiPasswordChange.cpp b/src/guiPasswordChange.cpp
index 2a7fb009a02db28c2998177837947e8927024bc5..273326fd59761d3802366610126703603b786af4 100644 (file)
--- a/src/guiPasswordChange.cpp
+++ b/src/guiPasswordChange.cpp
@@ -100,7 +100,7 @@ void GUIPasswordChange::regenerateGui(v2u32 screensize)
        {
                core::rect<s32> rect(0, 0, 110, 20);
                rect += topleft_client + v2s32(35, ypos+6);
-               Environment->addStaticText(chartowchar_t(gettext("Old Password")),
+               Environment->addStaticText(wgettext("Old Password"),
                        rect, false, true, this, -1);
        }
        changeCtype("C");
@@ -117,7 +117,7 @@ void GUIPasswordChange::regenerateGui(v2u32 screensize)
        {
                core::rect<s32> rect(0, 0, 110, 20);
                rect += topleft_client + v2s32(35, ypos+6);
-               Environment->addStaticText(chartowchar_t(gettext("New Password")),
+               Environment->addStaticText(wgettext("New Password"),
                        rect, false, true, this, -1);
        }
        changeCtype("C");
@@ -133,7 +133,7 @@ void GUIPasswordChange::regenerateGui(v2u32 screensize)
        {
                core::rect<s32> rect(0, 0, 110, 20);
                rect += topleft_client + v2s32(35, ypos+6);
-               Environment->addStaticText(chartowchar_t(gettext("Confirm Password")),
+               Environment->addStaticText(wgettext("Confirm Password"),
                        rect, false, true, this, -1);
        }
        changeCtype("C");
@@ -150,7 +150,7 @@ void GUIPasswordChange::regenerateGui(v2u32 screensize)
        {
                core::rect<s32> rect(0, 0, 140, 30);
                rect = rect + v2s32(size.X/2-140/2, ypos);
-               Environment->addButton(rect, this, ID_change, chartowchar_t(gettext("Change")));
+               Environment->addButton(rect, this, ID_change, wgettext("Change"));
        }
 
        ypos += 50;
@@ -159,7 +159,7 @@ void GUIPasswordChange::regenerateGui(v2u32 screensize)
                rect += topleft_client + v2s32(35, ypos);
                IGUIElement *e = 
                Environment->addStaticText(
-                       chartowchar_t(gettext("Passwords do not match!")),
+                       wgettext("Passwords do not match!"),
                        rect, false, true, this, ID_message);
                e->setVisible(false);
        }

diff --git a/src/guiPauseMenu.cpp b/src/guiPauseMenu.cpp
index 6cf364e5f6d8b3ee4ede2c9ee4ed3368f38d569f..8ccf0c46880f4169aa8cf8211629e212692c1265 100644 (file)
--- a/src/guiPauseMenu.cpp
+++ b/src/guiPauseMenu.cpp
@@ -108,28 +108,28 @@ void GUIPauseMenu::regenerateGui(v2u32 screensize)
                core::rect<s32> rect(0, 0, 140, btn_height);\r
                rect = rect + v2s32(size.X/2-140/2, btn_y);\r
                Environment->addButton(rect, this, 256,\r
-                       chartowchar_t(gettext("Continue")));\r
+                       wgettext("Continue"));\r
        }\r
        btn_y += btn_height + btn_gap;\r
        {\r
                core::rect<s32> rect(0, 0, 140, btn_height);\r
                rect = rect + v2s32(size.X/2-140/2, btn_y);\r
                Environment->addButton(rect, this, 261,\r
-                       chartowchar_t(gettext("Change Password")));\r
+                       wgettext("Change Password"));\r
        }\r
        btn_y += btn_height + btn_gap;\r
        {\r
                core::rect<s32> rect(0, 0, 140, btn_height);\r
                rect = rect + v2s32(size.X/2-140/2, btn_y);\r
                Environment->addButton(rect, this, 260,\r
-                       chartowchar_t(gettext("Disconnect")));\r
+                       wgettext("Disconnect"));\r
        }\r
        btn_y += btn_height + btn_gap;\r
        {\r
                core::rect<s32> rect(0, 0, 140, btn_height);\r
                rect = rect + v2s32(size.X/2-140/2, btn_y);\r
                Environment->addButton(rect, this, 257,\r
-                       chartowchar_t(gettext("Exit to OS")));\r
+                       wgettext("Exit to OS"));\r
        }\r
 \r
        {\r

diff --git a/src/guiTextInputMenu.cpp b/src/guiTextInputMenu.cpp
index a596025541eaea084aaa3ffcfa4f4c721576d987..bfe0ea5de259b0123a0d20f80a864f7049d92b5e 100644 (file)
--- a/src/guiTextInputMenu.cpp
+++ b/src/guiTextInputMenu.cpp
@@ -109,7 +109,7 @@ void GUITextInputMenu::regenerateGui(v2u32 screensize)
                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")));
+                       wgettext("Proceed"));
        }
        changeCtype("C");
 }