paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-11 17:36:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

email-notifications: Update email subjects with "PM" to "DM".

Browse Source 
Updates email notification subjects with "PM" to use "DM" instead.

Also, updates `tools/lib/capitalization.py` to include both "DM"
and "DMs".
This commit is contained in:
Lauryn Menard
2023-01-24 19:47:48 +01:00
committed by Tim Abbott
parent 182e6c0730
commit e39c689f36
3 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
templates/zerver/emails/missed_message.subject.txt
View File

@@ -1,6 +1,6 @@
{% if show_message_content %} {% if show_message_content %}
{% if group_pm %} {% trans %}Group PMs with {{ huddle_display_name }}{% endtrans %} {% if group_pm %} {% trans %}Group DMs with {{ huddle_display_name }}{% endtrans %}
{% elif private_message %} {% trans %}PMs with {{ sender_str }}{% endtrans %} {% elif private_message %} {% trans %}DMs with {{ sender_str }}{% endtrans %}
{% elif stream_email_notify or mention %} {% elif stream_email_notify or mention %}
{# {#
Some email clients, like Gmail Web (as of 2022), will auto-thread Some email clients, like Gmail Web (as of 2022), will auto-thread

2
tools/lib/capitalization.py
View File

@@ -31,6 +31,8 @@ IGNORED_PHRASES = [
r"Pivotal", r"Pivotal",
r"PM", r"PM",
r"PMs", r"PMs",
r"DM",
r"DMs",
r"Slack", r"Slack",
r"Google", r"Google",
r"Terms of Service", r"Terms of Service",

30
zerver/tests/test_email_notifications.py
View File

@@ -506,10 +506,10 @@ class TestMissedMessages(ZulipTestCase):
"Extremely personal message!", "Extremely personal message!",
) )
verify_body_include = ["Extremely personal message!"] verify_body_include = ["Extremely personal message!"]
email_subject = "PMs with Othello, the Moor of Venice" email_subject = "DMs with Othello, the Moor of Venice"
if realm_name_in_notifications: if realm_name_in_notifications:
email_subject = "PMs with Othello, the Moor of Venice [Zulip Dev]" email_subject = "DMs with Othello, the Moor of Venice [Zulip Dev]"
self._test_cases(msg_id, verify_body_include, email_subject, False) self._test_cases(msg_id, verify_body_include, email_subject, False)
def _extra_context_in_missed_stream_messages_mention( def _extra_context_in_missed_stream_messages_mention(
@@ -676,7 +676,7 @@ class TestMissedMessages(ZulipTestCase):
if show_message_content: if show_message_content:
verify_body_include = ["> Extremely personal message!"] verify_body_include = ["> Extremely personal message!"]
email_subject = "PMs with Othello, the Moor of Venice" email_subject = "DMs with Othello, the Moor of Venice"
verify_body_does_not_include: List[str] = [] verify_body_does_not_include: List[str] = []
else: else:
if message_content_disabled_by_realm: if message_content_disabled_by_realm:
@@ -717,7 +717,7 @@ class TestMissedMessages(ZulipTestCase):
"Extremely personal message!", "Extremely personal message!",
) )
verify_body_include = ["Reply to this email directly, or view it in Zulip Dev Zulip"] verify_body_include = ["Reply to this email directly, or view it in Zulip Dev Zulip"]
email_subject = "PMs with Othello, the Moor of Venice" email_subject = "DMs with Othello, the Moor of Venice"
self._test_cases(msg_id, verify_body_include, email_subject, send_as_user) self._test_cases(msg_id, verify_body_include, email_subject, send_as_user)
def _reply_warning_in_missed_personal_messages(self, send_as_user: bool) -> None: def _reply_warning_in_missed_personal_messages(self, send_as_user: bool) -> None:
@@ -727,7 +727,7 @@ class TestMissedMessages(ZulipTestCase):
"Extremely personal message!", "Extremely personal message!",
) )
verify_body_include = ["Do not reply to this email."] verify_body_include = ["Do not reply to this email."]
email_subject = "PMs with Othello, the Moor of Venice" email_subject = "DMs with Othello, the Moor of Venice"
self._test_cases(msg_id, verify_body_include, email_subject, send_as_user) self._test_cases(msg_id, verify_body_include, email_subject, send_as_user)
def _extra_context_in_missed_huddle_messages_two_others( def _extra_context_in_missed_huddle_messages_two_others(
@@ -746,7 +746,7 @@ class TestMissedMessages(ZulipTestCase):
verify_body_include = [ verify_body_include = [
"Othello, the Moor of Venice: > Group personal message! -- Reply" "Othello, the Moor of Venice: > Group personal message! -- Reply"
] ]
email_subject = "Group PMs with Iago and Othello, the Moor of Venice" email_subject = "Group DMs with Iago and Othello, the Moor of Venice"
verify_body_does_not_include: List[str] = [] verify_body_does_not_include: List[str] = []
else: else:
verify_body_include = [ verify_body_include = [
@@ -785,7 +785,7 @@ class TestMissedMessages(ZulipTestCase):
verify_body_include = ["Othello, the Moor of Venice: > Group personal message! -- Reply"] verify_body_include = ["Othello, the Moor of Venice: > Group personal message! -- Reply"]
email_subject = ( email_subject = (
"Group PMs with Cordelia, Lear's daughter, Iago, and Othello, the Moor of Venice" "Group DMs with Cordelia, Lear's daughter, Iago, and Othello, the Moor of Venice"
) )
self._test_cases(msg_id, verify_body_include, email_subject, send_as_user) self._test_cases(msg_id, verify_body_include, email_subject, send_as_user)
@@ -802,7 +802,7 @@ class TestMissedMessages(ZulipTestCase):
) )
verify_body_include = ["Othello, the Moor of Venice: > Group personal message! -- Reply"] verify_body_include = ["Othello, the Moor of Venice: > Group personal message! -- Reply"]
email_subject = "Group PMs with Cordelia, Lear's daughter, Iago, and 2 others" email_subject = "Group DMs with Cordelia, Lear's daughter, Iago, and 2 others"
self._test_cases(msg_id, verify_body_include, email_subject, send_as_user) self._test_cases(msg_id, verify_body_include, email_subject, send_as_user)
def _deleted_message_in_missed_stream_messages(self, send_as_user: bool) -> None: def _deleted_message_in_missed_stream_messages(self, send_as_user: bool) -> None:
@@ -1189,7 +1189,7 @@ class TestMissedMessages(ZulipTestCase):
verify_body_include = [ verify_body_include = [
f'<img alt=":green_tick:" src="{realm_emoji_url}" title="green tick" style="height: 20px;">' f'<img alt=":green_tick:" src="{realm_emoji_url}" title="green tick" style="height: 20px;">'
] ]
email_subject = "PMs with Othello, the Moor of Venice" email_subject = "DMs with Othello, the Moor of Venice"
self._test_cases( self._test_cases(
msg_id, verify_body_include, email_subject, send_as_user=False, verify_html_body=True msg_id, verify_body_include, email_subject, send_as_user=False, verify_html_body=True
) )
@@ -1206,7 +1206,7 @@ class TestMissedMessages(ZulipTestCase):
verify_body_include = [ verify_body_include = [
'<img alt=":hamburger:" src="http://testserver/static/generated/emoji/images-twitter-64/1f354.png" title="hamburger" style="height: 20px;">' '<img alt=":hamburger:" src="http://testserver/static/generated/emoji/images-twitter-64/1f354.png" title="hamburger" style="height: 20px;">'
] ]
email_subject = "PMs with Othello, the Moor of Venice" email_subject = "DMs with Othello, the Moor of Venice"
self._test_cases( self._test_cases(
msg_id, verify_body_include, email_subject, send_as_user=False, verify_html_body=True msg_id, verify_body_include, email_subject, send_as_user=False, verify_html_body=True
) )
@@ -1222,7 +1222,7 @@ class TestMissedMessages(ZulipTestCase):
verify_body_include = [ verify_body_include = [
f'<a class="stream" data-stream-id="{stream_id}" href="{href}">#Verona</a' f'<a class="stream" data-stream-id="{stream_id}" href="{href}">#Verona</a'
] ]
email_subject = "PMs with Othello, the Moor of Venice" email_subject = "DMs with Othello, the Moor of Venice"
self._test_cases( self._test_cases(
msg_id, verify_body_include, email_subject, send_as_user=False, verify_html_body=True msg_id, verify_body_include, email_subject, send_as_user=False, verify_html_body=True
) )
@@ -1239,7 +1239,7 @@ class TestMissedMessages(ZulipTestCase):
verify_body_include = [ verify_body_include = [
f"view it in Zulip Dev Zulip: http://zulip.testserver/#narrow/pm-with/{cordelia.id}-{encoded_name}" f"view it in Zulip Dev Zulip: http://zulip.testserver/#narrow/pm-with/{cordelia.id}-{encoded_name}"
] ]
email_subject = "PMs with Cordelia, Lear's daughter" email_subject = "DMs with Cordelia, Lear's daughter"
self._test_cases(msg_id, verify_body_include, email_subject, send_as_user=False) self._test_cases(msg_id, verify_body_include, email_subject, send_as_user=False)
def test_sender_name_in_missed_message(self) -> None: def test_sender_name_in_missed_message(self) -> None:
@@ -1302,9 +1302,9 @@ class TestMissedMessages(ZulipTestCase):
], ],
) )
self.assert_length(mail.outbox, 2) self.assert_length(mail.outbox, 2)
email_subject = "PMs with Othello, the Moor of Venice" email_subject = "DMs with Othello, the Moor of Venice"
self.assertEqual(mail.outbox[0].subject, email_subject) self.assertEqual(mail.outbox[0].subject, email_subject)
email_subject = "PMs with Iago" email_subject = "DMs with Iago"
self.assertEqual(mail.outbox[1].subject, email_subject) self.assertEqual(mail.outbox[1].subject, email_subject)
def test_multiple_stream_messages(self) -> None: def test_multiple_stream_messages(self) -> None:
@@ -1586,7 +1586,7 @@ class TestMissedMessages(ZulipTestCase):
"```\n```", "```\n```",
) )
verify_body_include = ["view it in Zulip Dev Zulip"] verify_body_include = ["view it in Zulip Dev Zulip"]
email_subject = "PMs with Othello, the Moor of Venice" email_subject = "DMs with Othello, the Moor of Venice"
self._test_cases( self._test_cases(
msg_id, verify_body_include, email_subject, send_as_user=False, verify_html_body=True msg_id, verify_body_include, email_subject, send_as_user=False, verify_html_body=True
) )