Mercurial > kallithea
changeset 746:18a3ca35d501 beta
fixed grammar in taken email error
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Tue, 23 Nov 2010 22:33:59 +0100 |
| parents | c366b237c91d |
| children | 2f89beda06a1 |
| files | rhodecode/model/forms.py rhodecode/tests/functional/test_admin_settings.py rhodecode/tests/functional/test_login.py |
| diffstat | 3 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/model/forms.py Tue Nov 23 22:31:08 2010 +0100 +++ b/rhodecode/model/forms.py Tue Nov 23 22:33:59 2010 +0100 @@ -264,7 +264,7 @@ try: user = sa.query(User).filter(User.email == value).scalar() if user: - raise formencode.Invalid(_("That e-mail address is already taken") , + raise formencode.Invalid(_("This e-mail address is already taken") , value, state) finally: meta.Session.remove() @@ -280,7 +280,7 @@ try: user = sa.query(User).filter(User.email == value).scalar() if user is None: - raise formencode.Invalid(_("That e-mail address doesn't exist.") , + raise formencode.Invalid(_("This e-mail address doesn't exist.") , value, state) finally: meta.Session.remove()
--- a/rhodecode/tests/functional/test_admin_settings.py Tue Nov 23 22:31:08 2010 +0100 +++ b/rhodecode/tests/functional/test_admin_settings.py Tue Nov 23 22:33:59 2010 +0100 @@ -97,7 +97,7 @@ email=new_email,)) print response - assert 'That e-mail address is already taken' in response.body, 'Missing error message about existing email' + assert 'This e-mail address is already taken' in response.body, 'Missing error message about existing email' def test_my_account_update_err(self):
--- a/rhodecode/tests/functional/test_login.py Tue Nov 23 22:31:08 2010 +0100 +++ b/rhodecode/tests/functional/test_login.py Tue Nov 23 22:33:59 2010 +0100 @@ -89,7 +89,7 @@ 'lastname':'test'}) assert response.status == '200 OK', 'Wrong response from register page got %s' % response.status - assert 'That e-mail address is already taken' in response.body + assert 'This e-mail address is already taken' in response.body def test_register_err_same_email_case_sensitive(self): response = self.app.post(url(controller='login', action='register'), @@ -100,7 +100,7 @@ 'name':'test', 'lastname':'test'}) assert response.status == '200 OK', 'Wrong response from register page got %s' % response.status - assert 'That e-mail address is already taken' in response.body + assert 'This e-mail address is already taken' in response.body def test_register_err_wrong_data(self): response = self.app.post(url(controller='login', action='register'), @@ -200,7 +200,7 @@ response = self.app.post(url(controller='login', action='password_reset'), {'email':'marcin@wrongmail.org', }) - assert "That e-mail address doesn't exist" in response.body, 'Missing error message about wrong email' + assert "This e-mail address doesn't exist" in response.body, 'Missing error message about wrong email' def test_forgot_password(self): response = self.app.get(url(controller='login', action='password_reset'))