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

Use core::stringw functions

Browse Source
This commit is contained in:
amtkhdkr 2014-05-21 16:14:44 +05:30
parent 3577660f84
commit efdaac1040
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/states_screens/register_screen.cpp
View File

@ -76,8 +76,6 @@ void RegisterScreen::doRegister()
core::stringw password_confirm = getWidget<TextBoxWidget>("password_confirm") core::stringw password_confirm = getWidget<TextBoxWidget>("password_confirm")
->getText().trim(); ->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") core::stringw email_confirm = getWidget<TextBoxWidget>("email_confirm")
->getText().trim(); ->getText().trim();
m_info_widget->setErrorColor(); m_info_widget->setErrorColor();
@ -102,9 +100,9 @@ void RegisterScreen::doRegister()
{ {
m_info_widget->setText(_("Email has to be between 4 and 50 characters long!"), false); m_info_widget->setText(_("Email has to be between 4 and 50 characters long!"), false);
} }
else if (stdEmail.find(atSign)== -1 || stdEmail.find(dotSign)== -1 ||\ else if ( email.find(L"@")== -1 || email.find(L".")== -1 ||
( stdEmail.find_last_of(dotSign) - stdEmail.find_last_of(atSign) <= 2 ) ||\ (email.findLast(L'.') - email.findLast(L'@') <= 2 ) ||
stdEmail.find_last_of(atSign)==0 ) email.findLast(L'@')==0 )
{ {
m_info_widget->setText(_("Email is invalid!"), false); m_info_widget->setText(_("Email is invalid!"), false);
} }