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

email_notifications: Change missed message for wildcard mention. 

Add #stream_name to wildcard mention because it is important
information for interpreting the wildcard mention (larger streams may
mean something very different to you than small ones).

Fixes #22885.
This commit is contained in:
khanhdq 2022-09-30 01:56:25 +09:00 committed by Tim Abbott
parent bb8365ab36
commit ee2141b0f1
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,7 +30,7 @@
{% elif mentioned_user_group_name %}
{% trans %}You are receiving this because @{{ mentioned_user_group_name }} was mentioned.{% endtrans %}<br />
{% elif wildcard_mentioned %}
{% trans %}You are receiving this because everyone was mentioned.{% endtrans %}<br />
{% trans %}You are receiving this because everyone was mentioned in #{{ stream_name }}.{% endtrans %}<br />
{% elif stream_email_notify %}
{% trans %}You are receiving this because you have email notifications enabled for #{{ stream_name }}.{% endtrans %}<br />
{% endif %}

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

@ -26,7 +26,7 @@ See {{ alert_notif_url }} for more details.
{% elif mentioned_user_group_name %}
{% trans %}You are receiving this because @{{ mentioned_user_group_name }} was mentioned.{% endtrans %}
{% elif wildcard_mentioned %}
{% trans %}You are receiving this because everyone was mentioned.{% endtrans %}
{% trans %}You are receiving this because everyone was mentioned in #{{ stream_name }}.{% endtrans %}
{% elif stream_email_notify %}
{% trans %}You are receiving this because you have email notifications enabled for #{{ stream_name }}.{% endtrans %}
{% endif %}

4
zerver/tests/test_email_notifications.py
View File

@ -561,7 +561,7 @@ class TestMissedMessages(ZulipTestCase):
if show_message_content:
verify_body_include = [
"Othello, the Moor of Venice: > 1 > 2 > 3 > 4 > 5 > @**all** -- ",
"You are receiving this because everyone was mentioned.",
"You are receiving this because everyone was mentioned in #Denmark.",
]
email_subject = "#Denmark > test"
verify_body_does_not_include: List[str] = []
@ -958,7 +958,7 @@ class TestMissedMessages(ZulipTestCase):
expected_email_include = [
"Othello, the Moor of Venice: > 1 > @**all** -- ",
"You are receiving this because everyone was mentioned.",
"You are receiving this because everyone was mentioned in #Denmark.",
]
for text in expected_email_include: