X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2FguiPasswordChange.cpp;h=c8a2214b6e2ea1ddc76ce5e93df1bf657e5f472c;hb=f6912f4241a2dd13d987d27a073a3b76faf2cb7d;hp=89a6ce682be3fbc0f5e3d1118fcb41d62479196b;hpb=92f504f98d4af7a31df7b1bfa80fce114638f4cf;p=dragonfireclient.git

diff --git a/src/guiPasswordChange.cpp b/src/guiPasswordChange.cpp
index 89a6ce682..c8a2214b6 100644
--- a/src/guiPasswordChange.cpp
+++ b/src/guiPasswordChange.cpp
@@ -1,7 +1,7 @@
 /*
-Part of Minetest-c55
-Copyright (C) 2011 celeron55, Perttu Ahola <celeron55@gmail.com>
-Copyright (C) 2011 Ciaran Gultnieks <ciaran@ciarang.com>
+Part of Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
+Copyright (C) 2013 Ciaran Gultnieks <ciaran@ciarang.com>
 
 Permission to use, copy, modify, and distribute this software for any
 purpose with or without fee is hereby granted, provided that the above
@@ -20,6 +20,11 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "debug.h"
 #include "serialization.h"
 #include <string>
+#include <IGUICheckBox.h>
+#include <IGUIEditBox.h>
+#include <IGUIButton.h>
+#include <IGUIStaticText.h>
+#include <IGUIFont.h>
 
 #include "gettext.h"
 
@@ -90,20 +95,18 @@ void GUIPasswordChange::regenerateGui(v2u32 screensize)
 
 	v2s32 size = rect.getSize();
 	v2s32 topleft_client(40, 0);
-	v2s32 size_client = size - v2s32(40, 0);
 
 	/*
 		Add stuff
 	*/
 	s32 ypos = 50;
-	setlocale(LC_CTYPE, "");
 	{
 		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);
+		wchar_t* text = wgettext("Old Password");
+		Environment->addStaticText(text, rect, false, true, this, -1);
+		delete[] text;
 	}
-	setlocale(LC_CTYPE, "en_US");
 	{
 		core::rect<s32> rect(0, 0, 230, 30);
 		rect += topleft_client + v2s32(160, ypos);
@@ -113,14 +116,13 @@ void GUIPasswordChange::regenerateGui(v2u32 screensize)
 		e->setPasswordBox(true);
 	}
 	ypos += 50;
-	setlocale(LC_CTYPE, "");
 	{
 		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);
+		wchar_t* text = wgettext("New Password");
+		Environment->addStaticText(text, rect, false, true, this, -1);
+		delete[] text;
 	}
-	setlocale(LC_CTYPE, "en_US");
 	{
 		core::rect<s32> rect(0, 0, 230, 30);
 		rect += topleft_client + v2s32(160, ypos);
@@ -129,14 +131,13 @@ void GUIPasswordChange::regenerateGui(v2u32 screensize)
 		e->setPasswordBox(true);
 	}
 	ypos += 50;
-	setlocale(LC_CTYPE, "");
 	{
 		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);
+		wchar_t* text = wgettext("Confirm Password");
+		Environment->addStaticText(text, rect, false, true, this, -1);
+		delete[] text;
 	}
-	setlocale(LC_CTYPE, "en_US");
 	{
 		core::rect<s32> rect(0, 0, 230, 30);
 		rect += topleft_client + v2s32(160, ypos);
@@ -146,25 +147,26 @@ void GUIPasswordChange::regenerateGui(v2u32 screensize)
 	}
 
 	ypos += 50;
-	setlocale(LC_CTYPE, "");
 	{
 		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")));
+		wchar_t* text = wgettext("Change");
+		Environment->addButton(rect, this, ID_change, text);
+		delete[] text;
 	}
 
 	ypos += 50;
 	{
 		core::rect<s32> rect(0, 0, 300, 20);
 		rect += topleft_client + v2s32(35, ypos);
+		wchar_t* text = wgettext("Passwords do not match!");
 		IGUIElement *e = 
 		Environment->addStaticText(
-			chartowchar_t(gettext("Passwords do not match!")),
+			text,
 			rect, false, true, this, ID_message);
 		e->setVisible(false);
+		delete[] text;
 	}
-	setlocale(LC_CTYPE, "en_US");
-
 }
 
 void GUIPasswordChange::drawMenu()