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

Merge remote-tracking branch 'origin/master' into refactor_shaders

Browse Source
This commit is contained in:
hiker 2015-06-02 14:49:50 +10:00
commit 2cf4341916
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/po/supertuxkart.pot
View File

@ -1067,7 +1067,7 @@ msgid "Email"
msgstr ""
#: src/states_screens/register_screen.cpp:292
msgid "Email has to be between 4 and 50 characters long!"
msgid "Email has to be between 5 and 254 characters long!"
msgstr ""
#: src/states_screens/register_screen.cpp:298

1
src/audio/sfx_manager.cpp
View File

@ -28,6 +28,7 @@
#include <pthread.h>
#include <stdexcept>
#include <algorithm>
#include <cerrno>
#include <map>
#include <stdio.h>

4
src/states_screens/register_screen.cpp
View File

@ -287,9 +287,9 @@ void RegisterScreen::doRegister()
{
m_info_widget->setText(_("Password has to be between 8 and 30 characters long!"), false);
}
else if (email.size() < 4 || email.size() > 50)
else if (email.size() < 5 || email.size() > 254)
{
m_info_widget->setText(_("Email has to be between 4 and 50 characters long!"), false);
m_info_widget->setText(_("Email has to be between 5 and 254 characters long!"), false);
}
else if ( email.find(L"@")== -1 || email.find(L".")== -1 ||
(email.findLast(L'.') - email.findLast(L'@') <= 2 ) ||