From 5ab44f6993cc2f3d55e97c53b533733a486978a2 Mon Sep 17 00:00:00 2001 From: Tim Abbott Date: Wed, 3 Apr 2013 16:49:10 -0400 Subject: [PATCH] Add note to invite notification on historical messages. (imported from commit ea3da4bd5b3e461b37b1d5af685d96bf5ecdb847) --- zephyr/tests.py | 3 ++- zephyr/views.py | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/zephyr/tests.py b/zephyr/tests.py index 941d6de74f..d977c84300 100644 --- a/zephyr/tests.py +++ b/zephyr/tests.py @@ -854,7 +854,8 @@ class SubscriptionAPITest(AuthedTestCase): self.assertEqual(msg.sender_id, self.get_user_profile("humbug+notifications@humbughq.com").id) 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.assertEqual(msg.content, expected_msg) recipients = get_display_recipient(msg.recipient) diff --git a/zephyr/views.py b/zephyr/views.py index 9e69389031..4aca95b86b 100644 --- a/zephyr/views.py +++ b/zephyr/views.py @@ -1029,6 +1029,7 @@ def add_subscriptions_backend(request, user_profile, msg += "* %s%s\n" % ( stream, " (**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", "private", email, "", msg)