Minor fixes in translations

[dragonfireclient.git] / src / guiPasswordChange.cpp

diff --git a/src/guiPasswordChange.cpp b/src/guiPasswordChange.cpp
index 79601a99fb5724cd60f238f7c12c7f34b366b65e..0e19f571d9881d9dd6e142b765032ec4b564fb57 100644 (file)
--- 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
 
 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 "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"
 
 
 #include "gettext.h"
 


@@ -90,16 +95,19 @@ void GUIPasswordChange::regenerateGui(v2u32 screensize)
 
        v2s32 size = rect.getSize();
        v2s32 topleft_client(40, 0);
 
        v2s32 size = rect.getSize();
        v2s32 topleft_client(40, 0);

-       v2s32 size_client = size - v2s32(40, 0);
+
+       const wchar_t *text;

 
        /*
                Add stuff
        */
        s32 ypos = 50;
        {
 
        /*
                Add stuff
        */
        s32 ypos = 50;
        {

-               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);
+               core::rect<s32> rect(0, 0, 150, 20);
+               rect += topleft_client + v2s32(25, ypos+6);
+               text = wgettext("Old Password");
+               Environment->addStaticText(text, rect, false, true, this, -1);
+               delete[] text;

        }
        {
                core::rect<s32> rect(0, 0, 230, 30);
        }
        {
                core::rect<s32> rect(0, 0, 230, 30);


@@ -111,9 +119,11 @@ void GUIPasswordChange::regenerateGui(v2u32 screensize)
        }
        ypos += 50;
        {
        }
        ypos += 50;
        {

-               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);
+               core::rect<s32> rect(0, 0, 150, 20);
+               rect += topleft_client + v2s32(25, ypos+6);
+               text = wgettext("New Password");
+               Environment->addStaticText(text, rect, false, true, this, -1);
+               delete[] text;

        }
        {
                core::rect<s32> rect(0, 0, 230, 30);
        }
        {
                core::rect<s32> rect(0, 0, 230, 30);


@@ -124,9 +134,11 @@ void GUIPasswordChange::regenerateGui(v2u32 screensize)
        }
        ypos += 50;
        {
        }
        ypos += 50;
        {

-               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);
+               core::rect<s32> rect(0, 0, 150, 20);
+               rect += topleft_client + v2s32(25, ypos+6);
+               text = wgettext("Confirm Password");
+               Environment->addStaticText(text, rect, false, true, this, -1);
+               delete[] text;

        }
        {
                core::rect<s32> rect(0, 0, 230, 30);
        }
        {
                core::rect<s32> rect(0, 0, 230, 30);


@@ -140,18 +152,23 @@ void GUIPasswordChange::regenerateGui(v2u32 screensize)
        {
                core::rect<s32> rect(0, 0, 140, 30);
                rect = rect + v2s32(size.X/2-140/2, ypos);
        {
                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")));
+               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);
        }
 
        ypos += 50;
        {
                core::rect<s32> rect(0, 0, 300, 20);
                rect += topleft_client + v2s32(35, ypos);

+               text = wgettext("Passwords do not match!");

                IGUIElement *e = 
                IGUIElement *e = 

-               Environment->addStaticText(chartowchar_t(gettext("Passwords do not match!")), rect, false, true, this, ID_message);
+               Environment->addStaticText(
+                       text,
+                       rect, false, true, this, ID_message);

                e->setVisible(false);
                e->setVisible(false);

+               delete[] text;

        }
        }

-

 }
 
 void GUIPasswordChange::drawMenu()
 }
 
 void GUIPasswordChange::drawMenu()