diff --git a/templates/zerver/emails/missed_message.subject b/templates/zerver/emails/missed_message.subject index b3e2e9042c..a9800fde9b 100644 --- a/templates/zerver/emails/missed_message.subject +++ b/templates/zerver/emails/missed_message.subject @@ -1,4 +1,7 @@ -{% if group_pm %} Group PMs with {{ huddle_display_name }} in {{ realm_str }} -{% elif at_mention %} {{ sender_str }} mentioned you in {{ realm_str }} -{% elif private_message %} {{ sender_str }} sent you a message in {{ realm_str }} +{% if group_pm %} Group PMs with {{ huddle_display_name }} +{% elif at_mention %} {{ sender_str }} mentioned you +{% elif private_message %} {{ sender_str }} sent you a message +{% endif %} +{% if realm_name_in_notifications %} + in {{ realm_str }} {% endif %} diff --git a/zerver/lib/send_email.py b/zerver/lib/send_email.py index bcdd88a9f4..377fb5bda6 100644 --- a/zerver/lib/send_email.py +++ b/zerver/lib/send_email.py @@ -25,11 +25,13 @@ def build_email(template_prefix, to_email, from_name=None, from_address=None, reply_to_email=None, context={}): # type: (str, Text, Optional[Text], Optional[Text], Optional[Text], Dict[str, Any]) -> EmailMultiAlternatives context.update({ + 'realm_name_in_notifications': False, 'support_email': FromAddress.SUPPORT, 'verbose_support_offers': settings.VERBOSE_SUPPORT_OFFERS, }) subject = loader.render_to_string(template_prefix + '.subject', - context=context, using='Jinja2_plaintext').strip() + context=context, + using='Jinja2_plaintext').strip().replace('\n', '') message = loader.render_to_string(template_prefix + '.txt', context=context, using='Jinja2_plaintext') html_message = loader.render_to_string(template_prefix + '.html', context) diff --git a/zerver/tests/test_notifications.py b/zerver/tests/test_notifications.py index 1c5084b933..6f9e7ad201 100644 --- a/zerver/tests/test_notifications.py +++ b/zerver/tests/test_notifications.py @@ -72,7 +72,7 @@ class TestMissedMessages(ZulipTestCase): self.send_message(self.example_email('othello'), "Denmark", Recipient.STREAM, '11', subject='test2') msg_id = self.send_message(self.example_email('othello'), "denmark", Recipient.STREAM, '@**King Hamlet**') body = 'Denmark > test Othello, the Moor of Venice 1 2 3 4 5 6 7 8 9 10 @**King Hamlet**' - subject = 'Othello, the Moor of Venice mentioned you in Zulip Dev' + subject = 'Othello, the Moor of Venice mentioned you' self._test_cases(tokens, msg_id, body, subject, send_as_user) @patch('zerver.lib.email_mirror.generate_random_token') @@ -85,7 +85,7 @@ class TestMissedMessages(ZulipTestCase): self.send_message(self.example_email('cordelia'), "Denmark", Recipient.STREAM, str(i)) msg_id = self.send_message(self.example_email('othello'), "Denmark", Recipient.STREAM, '@**King Hamlet**') body = 'Denmark > test Cordelia Lear 0 1 2 Othello, the Moor of Venice @**King Hamlet**' - subject = 'Othello, the Moor of Venice mentioned you in Zulip Dev' + subject = 'Othello, the Moor of Venice mentioned you' self._test_cases(tokens, msg_id, body, subject, send_as_user) @patch('zerver.lib.email_mirror.generate_random_token') @@ -98,7 +98,7 @@ class TestMissedMessages(ZulipTestCase): Recipient.PERSONAL, 'Extremely personal message!') body = 'You and Othello, the Moor of Venice Extremely personal message!' - subject = 'Othello, the Moor of Venice sent you a message in Zulip Dev' + subject = 'Othello, the Moor of Venice sent you a message' self._test_cases(tokens, msg_id, body, subject, send_as_user) @patch('zerver.lib.email_mirror.generate_random_token') @@ -111,7 +111,7 @@ class TestMissedMessages(ZulipTestCase): Recipient.PERSONAL, 'Extremely personal message!') body = 'Or just reply to this email.' - subject = 'Othello, the Moor of Venice sent you a message in Zulip Dev' + subject = 'Othello, the Moor of Venice sent you a message' self._test_cases(tokens, msg_id, body, subject, send_as_user) @patch('zerver.lib.email_mirror.generate_random_token') @@ -124,7 +124,7 @@ class TestMissedMessages(ZulipTestCase): Recipient.PERSONAL, 'Extremely personal message!') body = 'Please do not reply to this automated message.' - subject = 'Othello, the Moor of Venice sent you a message in Zulip Dev' + subject = 'Othello, the Moor of Venice sent you a message' self._test_cases(tokens, msg_id, body, subject, send_as_user) @patch('zerver.lib.email_mirror.generate_random_token') @@ -140,7 +140,7 @@ class TestMissedMessages(ZulipTestCase): body = ('You and Iago, Othello, the Moor of Venice Othello,' ' the Moor of Venice Group personal message') - subject = 'Group PMs with Iago and Othello, the Moor of Venice in Zulip Dev' + subject = 'Group PMs with Iago and Othello, the Moor of Venice' self._test_cases(tokens, msg_id, body, subject, send_as_user) @patch('zerver.lib.email_mirror.generate_random_token') @@ -156,7 +156,7 @@ class TestMissedMessages(ZulipTestCase): body = ('You and Cordelia Lear, Iago, Othello, the Moor of Venice Othello,' ' the Moor of Venice Group personal message') - subject = 'Group PMs with Cordelia Lear, Iago, and Othello, the Moor of Venice in Zulip Dev' + subject = 'Group PMs with Cordelia Lear, Iago, and Othello, the Moor of Venice' self._test_cases(tokens, msg_id, body, subject, send_as_user) @patch('zerver.lib.email_mirror.generate_random_token') @@ -175,7 +175,7 @@ class TestMissedMessages(ZulipTestCase): body = ('You and Cordelia Lear, Iago, Othello, the Moor of Venice, Prospero from The Tempest' ' Othello, the Moor of Venice Group personal message') - subject = 'Group PMs with Cordelia Lear, Iago, and 2 others in Zulip Dev' + subject = 'Group PMs with Cordelia Lear, Iago, and 2 others' self._test_cases(tokens, msg_id, body, subject, send_as_user) @patch('zerver.lib.email_mirror.generate_random_token') @@ -347,5 +347,5 @@ class TestMissedMessages(ZulipTestCase): Recipient.PERSONAL, 'Extremely personal message with a realm emoji :test_emoji:!') body = ':test_emoji:' - subject = 'Othello, the Moor of Venice sent you a message in Zulip Dev' + subject = 'Othello, the Moor of Venice sent you a message' self._test_cases(tokens, msg_id, body, subject, send_as_user=False, verify_html_body=True)