ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tested changes for wchar

Browse Source
This commit is contained in:
amtkhdkr
2014-05-21 13:04:44 +05:30
parent 091ff10039
commit 397c2e4a33
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/states_screens/register_screen.cpp
View File

@@ -75,10 +75,11 @@ void RegisterScreen::doRegister()
core::stringw password = getWidget<TextBoxWidget>("password")->getText().trim();
core::stringw password_confirm = getWidget<TextBoxWidget>("password_confirm")
->getText().trim();
core::stringw email = getWidget<TextBoxWidget>("email")->getText().trim();
core::stringw email = getWidget<TextBoxWidget>("email")->getText().trim();
std::wstring stdEmail( getWidget<TextBoxWidget>("email")->getText().trim().c_str() );
std::wstring atSign(L"@"); std::wstring dotSign(L".");
core::stringw email_confirm = getWidget<TextBoxWidget>("email_confirm")
->getText().trim();
m_info_widget->setErrorColor();
if (password != password_confirm)
@@ -101,11 +102,11 @@ void RegisterScreen::doRegister()
{
m_info_widget->setText(_("Email has to be between 4 and 50 characters long!"), false);
}
else if (email.find("@")== -1 || email.find(".")== -1 ||\
( email.find_last_of(".") - email.find_last_of("@") <= 2 ) ||\
email.find_last_of("@")==0 )
else if (stdEmail.find(atSign)== -1 || stdEmail.find(dotSign)== -1 ||\
( stdEmail.find_last_of(dotSign) - stdEmail.find_last_of(atSign) <= 2 ) ||\
stdEmail.find_last_of(atSign)==0 )
{
m_info_widget->setText(_("Email is invalid!"), false);
m_info_widget->setText(_("Email is invalid!"), false);
}
else
{