Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

docs: Correct “login” as a verb to “log in”. 

Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg 2020-08-10 17:20:10 -07:00 committed by Tim Abbott
parent 64b2212c23
commit 6dea085187
28 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
zerver/forms.py
View File

@ -346,7 +346,7 @@ class OurAuthenticationForm(AuthenticationForm):
try: try:
realm = get_realm(subdomain) realm = get_realm(subdomain)
except Realm.DoesNotExist: except Realm.DoesNotExist:
logging.warning("User %s attempted to password login to nonexistent subdomain %s", logging.warning("User %s attempted password login to nonexistent subdomain %s",
username, subdomain) username, subdomain)
raise ValidationError("Realm does not exist") raise ValidationError("Realm does not exist")
@ -368,7 +368,7 @@ class OurAuthenticationForm(AuthenticationForm):
raise ValidationError(mark_safe(DEACTIVATED_ACCOUNT_ERROR)) raise ValidationError(mark_safe(DEACTIVATED_ACCOUNT_ERROR))
if return_data.get("invalid_subdomain"): if return_data.get("invalid_subdomain"):
logging.warning("User %s attempted to password login to wrong subdomain %s", logging.warning("User %s attempted password login to wrong subdomain %s",
username, subdomain) username, subdomain)
raise ValidationError(mark_safe(WRONG_SUBDOMAIN_ERROR)) raise ValidationError(mark_safe(WRONG_SUBDOMAIN_ERROR))

2
zerver/tests/test_signup.py
View File

@ -631,7 +631,7 @@ class LoginTest(ZulipTestCase):
result = self.login_with_return(self.example_email("hamlet"), "xxx", result = self.login_with_return(self.example_email("hamlet"), "xxx",
subdomain="invalid") subdomain="invalid")
self.assertEqual(warn_log.output, [ self.assertEqual(warn_log.output, [
'WARNING:root:User hamlet@zulip.com attempted to password login to nonexistent subdomain invalid' 'WARNING:root:User hamlet@zulip.com attempted password login to nonexistent subdomain invalid'
]) ])
self.assertEqual(result.status_code, 404) self.assertEqual(result.status_code, 404)
self.assert_in_response("There is no Zulip organization hosted at this subdomain.", result) self.assert_in_response("There is no Zulip organization hosted at this subdomain.", result)