kallithea Changeset - 18a3ca35d501

Changeset - 18a3ca35d501

Parent rev.

Child rev.

[Not reviewed]

beta

0 3 0

Marcin Kuzminski - 15 years ago 2010-11-23 22:33:59
marcin@python-works.com

fixed grammar in taken email error

3 files changed with 6 insertions and 6 deletions:

rhodecode/model/forms.py

rhodecode/tests/functional/test_admin_settings.py

rhodecode/tests/functional/test_login.py

0 comments (0 inline, 0 general)

rhodecode/model/forms.py

➞

Show inline comments

@@ @@ -264,7 +264,7 @@ def UniqSystemEmail(old_data): @@
                 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 @@ class ValidSystemEmail(formencode.valida @@
         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()

rhodecode/tests/functional/test_admin_settings.py

➞

Show inline comments

@@ @@ -97,7 +97,7 @@ class TestAdminSettingsController(TestCo @@
                                                             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):

rhodecode/tests/functional/test_login.py

➞

Show inline comments

@@ @@ -89,7 +89,7 @@ class TestLoginController(TestController @@
                                              '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 @@ class TestLoginController(TestController @@
                                              '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 @@ class TestLoginController(TestController @@
         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'))

0 comments (0 inline, 0 general)