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

Add note to invite notification on historical messages. 

(imported from commit ea3da4bd5b3e461b37b1d5af685d96bf5ecdb847)
This commit is contained in:
Tim Abbott 2013-04-03 16:49:10 -04:00
parent 6f22fb706d
commit 5ab44f6993
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
zephyr/tests.py
View File

@ -854,7 +854,8 @@ class SubscriptionAPITest(AuthedTestCase):
self.assertEqual(msg.sender_id, self.assertEqual(msg.sender_id,
self.get_user_profile("humbug+notifications@humbughq.com").id) self.get_user_profile("humbug+notifications@humbughq.com").id)
expected_msg = ("Hi there! We thought you'd like to know that %s just " expected_msg = ("Hi there! We thought you'd like to know that %s just "
"subscribed you to the stream '%s'" "subscribed you to the stream '%s'\nYou can see historical "
"content on a non-invite-only stream by narrowing to it."
% (self.user_profile.full_name, streams[0])) % (self.user_profile.full_name, streams[0]))
self.assertEqual(msg.content, expected_msg) self.assertEqual(msg.content, expected_msg)
recipients = get_display_recipient(msg.recipient) recipients = get_display_recipient(msg.recipient)

1
zephyr/views.py
View File

@ -1029,6 +1029,7 @@ def add_subscriptions_backend(request, user_profile,
msg += "* %s%s\n" % ( msg += "* %s%s\n" % (
stream, stream,
" (**invite-only**)" if private_streams[stream] else "") " (**invite-only**)" if private_streams[stream] else "")
msg += "\nYou can see historical content on a non-invite-only stream by narrowing to it."
internal_send_message("humbug+notifications@humbughq.com", internal_send_message("humbug+notifications@humbughq.com",
"private", email, "", msg) "private", email, "", msg)