paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-10 08:56:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

"Already using Humbug" -> "Already using Zulip"

Browse Source 
(imported from commit e05812ed3bae64f9daa7d60a7d5b2404edb306fc)
This commit is contained in:
Scott Feeney
2013-07-29 13:47:31 -04:00
parent 9e2e857a88
commit 85ce86c4fd
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
zephyr/lib/actions.py
View File

@@ -1418,7 +1418,7 @@ def do_invite_users(user_profile, invitee_emails, streams):
lambda event: do_send_confirmation_email(user, user_profile)) lambda event: do_send_confirmation_email(user, user_profile))
if skipped: if skipped:
ret_error = "Some of those addresses are already using Humbug, \ ret_error = "Some of those addresses are already using Zulip, \
so we didn't send them an invitation. We did send invitations to everyone else!" so we didn't send them an invitation. We did send invitations to everyone else!"
ret_error_data = {'errors': skipped} ret_error_data = {'errors': skipped}

2
zephyr/tests.py
View File

@@ -1533,7 +1533,7 @@ earl-test@zulip.com""", ["Denmark"]))
{"invitee_emails": "\n".join(existing + new), {"invitee_emails": "\n".join(existing + new),
"stream": ["Denmark"]}) "stream": ["Denmark"]})
self.assert_json_error(result, self.assert_json_error(result,
"Some of those addresses are already using Humbug, \ "Some of those addresses are already using Zulip, \
so we didn't send them an invitation. We did send invitations to everyone else!") so we didn't send them an invitation. We did send invitations to everyone else!")
# We only created accounts for the new users. # We only created accounts for the new users.