paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-02 13:03:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

email: Update message content disabled wording for missed messages.

Browse Source 
This commit updates the wording used in missed messages emails
when message content is disabled.
The corresonding help URL included in the email has also
been updated.
This commit is contained in:
opmkumar
2025-04-04 11:40:28 +05:30
committed by Tim Abbott
parent ec81c027fc
commit 5530981db9
3 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
templates/zerver/emails/missed_message.html
View File

@@ -14,9 +14,9 @@
{% else %}
<div class="missed_message no-content-explanation">
{% if message_content_disabled_by_realm %}
{% trans help_url=realm_url + "/help/hide-message-content-in-emails" %}This email does not include message content because your organization has disabled <a class="content_disabled_help_link" href="{{ help_url }}">message content appearing in email notifications</a>.{% endtrans %}
{% trans help_url=realm_url + "/help/hide-message-content-in-emails" %}This email does not include message content because your organization <a class="content_disabled_help_link" href="{{ help_url }}">hides message content</a> in email notifications.{% endtrans %}
{% elif message_content_disabled_by_user %}
{% trans alert_notif_url=realm_url + "/help/dm-mention-alert-notifications" %}This email does not include message content because you have disabled <a class="content_disabled_help_link" href="{{ alert_notif_url }}">message content appearing in email notifications</a>.{% endtrans %}
{% trans help_url=realm_url + "/help/email-notifications#hide-message-content" %}This email does not include message content because you have chosen to <a class="content_disabled_help_link" href="{{ help_url }}">hide message content</a> in email notifications.{% endtrans %}
{% endif %}
</div>
{% endif %}

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

@@ -9,13 +9,11 @@
{% else %}
{% if message_content_disabled_by_realm %}
{% trans hide_content_url=realm_url + "/help/hide-message-content-in-emails" %}
This email does not include message content because your organization has disabled message content appearing in email notifications.
See {{ hide_content_url }} for more details.
This email does not include message content because your organization hides message content in email notifications. See {{ hide_content_url }} for more details.
{% endtrans %}
{% elif message_content_disabled_by_user %}
{% trans alert_notif_url=realm_url + "/help/dm-mention-alert-notifications" %}
This email does not include message content because you have disabled message content appearing in email notifications.
See {{ alert_notif_url }} for more details.
{% trans help_url=realm_url + "/help/email-notifications#hide-message-content" %}
This email does not include message content because you have chosen to hide message content in email notifications. See {{ help_url }} for more details.
{% endtrans %}
{% endif %}
{% endif %}

30
zerver/tests/test_message_notification_emails.py
View File

@@ -190,8 +190,8 @@ class TestMessageNotificationEmails(ZulipTestCase):
else:
# Test in case if message content in missed email message are disabled.
verify_body_include = [
"This email does not include message content because you have disabled message ",
"http://zulip.testserver/help/dm-mention-alert-notifications ",
"This email does not include message content because you have chosen to ",
"http://zulip.testserver/help/email-notifications#hide-message-content ",
"View or reply in Zulip Dev Zulip",
" Manage email preferences: http://zulip.testserver/#settings/notifications",
]
@@ -250,8 +250,8 @@ class TestMessageNotificationEmails(ZulipTestCase):
else:
# Test in case if message content in missed email message are disabled.
verify_body_include = [
"This email does not include message content because you have disabled message ",
"http://zulip.testserver/help/dm-mention-alert-notifications ",
"This email does not include message content because you have chosen to ",
"http://zulip.testserver/help/email-notifications#hide-message-content ",
"View or reply in Zulip Dev Zulip",
" Manage email preferences: http://zulip.testserver/#settings/notifications",
]
@@ -290,8 +290,8 @@ class TestMessageNotificationEmails(ZulipTestCase):
else:
# Test in case if message content in missed email message are disabled.
verify_body_include = [
"This email does not include message content because you have disabled message ",
"http://zulip.testserver/help/dm-mention-alert-notifications ",
"This email does not include message content because you have chosen to ",
"http://zulip.testserver/help/email-notifications#hide-message-content ",
"View or reply in Zulip Dev Zulip",
" Manage email preferences: http://zulip.testserver/#settings/notifications",
]
@@ -349,8 +349,8 @@ class TestMessageNotificationEmails(ZulipTestCase):
else:
# Test in case if message content in missed email message are disabled.
verify_body_include = [
"This email does not include message content because you have disabled message ",
"http://zulip.testserver/help/dm-mention-alert-notifications ",
"This email does not include message content because you have chosen to ",
"http://zulip.testserver/help/email-notifications#hide-message-content ",
"View or reply in Zulip Dev Zulip",
" Manage email preferences: http://zulip.testserver/#settings/notifications",
]
@@ -389,8 +389,8 @@ class TestMessageNotificationEmails(ZulipTestCase):
else:
# Test in case if message content in missed email message are disabled.
verify_body_include = [
"This email does not include message content because you have disabled message ",
"http://zulip.testserver/help/dm-mention-alert-notifications ",
"This email does not include message content because you have chosen to ",
"http://zulip.testserver/help/email-notifications#hide-message-content ",
"View or reply in Zulip Dev Zulip",
" Manage email preferences: http://zulip.testserver/#settings/notifications",
]
@@ -497,15 +497,15 @@ class TestMessageNotificationEmails(ZulipTestCase):
else:
if message_content_disabled_by_realm:
verify_body_include = [
"This email does not include message content because your organization has disabled",
"This email does not include message content because your organization",
"http://zulip.testserver/help/hide-message-content-in-emails",
"View or reply in Zulip Dev Zulip",
" Manage email preferences: http://zulip.testserver/#settings/notifications",
]
elif message_content_disabled_by_user:
verify_body_include = [
"This email does not include message content because you have disabled message ",
"http://zulip.testserver/help/dm-mention-alert-notifications ",
"This email does not include message content because you have chosen to ",
"http://zulip.testserver/help/email-notifications#hide-message-content ",
"View or reply in Zulip Dev Zulip",
" Manage email preferences: http://zulip.testserver/#settings/notifications",
]
@@ -565,8 +565,8 @@ class TestMessageNotificationEmails(ZulipTestCase):
verify_body_does_not_include: list[str] = []
else:
verify_body_include = [
"This email does not include message content because you have disabled message ",
"http://zulip.testserver/help/dm-mention-alert-notifications ",
"This email does not include message content because you have chosen to ",
"http://zulip.testserver/help/email-notifications#hide-message-content ",
"View or reply in Zulip Dev Zulip",
" Manage email preferences: http://zulip.testserver/#settings/notifications",
]