paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 05:53:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

emails: Mention why user is getting stream message notification.

Browse Source
This commit is contained in:
Vishnu Ks
2019-07-08 16:11:49 +05:30
committed by Tim Abbott
parent c4d28777ec
commit d23bcfa948
3 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
templates/zerver/emails/missed_message.source.html
View File

@@ -36,6 +36,8 @@
&mdash;<br> &mdash;<br>
{% if mention %} {% if mention %}
You are receiving this email because you were mentioned.<br> You are receiving this email because you were mentioned.<br>
{% elif stream_email_notify %}
You are receiving this email because you have email notifications enabled for this stream.<br>
{% endif %} {% endif %}
<a href="{{ realm_uri }}/#settings/notifications">Manage email preferences</a> | <a href="{{ unsubscribe_link }}">Unsubscribe</a> from missed message emails.<br> <a href="{{ realm_uri }}/#settings/notifications">Manage email preferences</a> | <a href="{{ unsubscribe_link }}">Unsubscribe</a> from missed message emails.<br>
{% if reply_to_zulip %} {% if reply_to_zulip %}

2
templates/zerver/emails/missed_message.txt
View File

@@ -14,6 +14,8 @@
{% if mention %} {% if mention %}
You are receiving this email because you were mentioned. You are receiving this email because you were mentioned.
{% elif stream_email_notify %}
You are receiving this email because you have email notifications enabled for this stream.<br>
{% endif %} {% endif %}
Manage email preferences: Manage email preferences:

4
zerver/tests/test_email_notifications.py
View File

@@ -271,7 +271,9 @@ class TestMissedMessages(ZulipTestCase):
msg_id = self.send_stream_message( msg_id = self.send_stream_message(
self.example_email('othello'), "denmark", self.example_email('othello'), "denmark",
'12') '12')
body = 'Othello, the Moor of Venice --- 1 2 3 4 5 6 7 8 9 10 12' body = ("Othello, the Moor of Venice --- 1 2 3 4 5 6 7 8 9 10 12 "
"You are receiving this email "
"because you have email notifications enabled for this stream.")
email_subject = '#Denmark > test' email_subject = '#Denmark > test'
self._test_cases(tokens, msg_id, body, email_subject, send_as_user, trigger='stream_email_notify') self._test_cases(tokens, msg_id, body, email_subject, send_as_user, trigger='stream_email_notify')