Commit f29e60c3 authored by Remi Rampin's avatar Remi Rampin

Change some messages

parent 28d2786a
......@@ -148,11 +148,12 @@ class Register(BaseHandler):
if password1 != password2:
raise validate.InvalidFormat(_f("Passwords do not match"))
if self.db.query(database.User).get(login) is not None:
raise validate.InvalidFormat(_f("Username is taken"))
raise validate.InvalidFormat(_f("User name is taken"))
if (email and
.filter( == email).count() > 0):
raise validate.InvalidFormat(_f("Email is already used"))
raise validate.InvalidFormat(_f("Email address is already "
user = database.User(login=login)
if email:
......@@ -240,8 +241,8 @@ class AskResetPassword(BaseHandler):
if user is None:
return self.render(
error=self.gettext("This email is not associated with any "
error=self.gettext("This email address is not associated with "
"any user"),
elif (user.email_sent is None or
user.email_sent + timedelta(days=1) < datetime.utcnow()):
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment