From db97e0e32929719691979d2246839926e1729eb5 Mon Sep 17 00:00:00 2001 From: Vishnu KS Date: Fri, 31 Jan 2020 19:08:57 +0530 Subject: [PATCH] emails: Use the word email instead of message in do not reply sentence. Fixes #13693 --- templates/zerver/emails/missed_message.source.html | 2 +- templates/zerver/emails/missed_message.txt | 2 +- version.py | 2 +- zerver/tests/test_email_notifications.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/zerver/emails/missed_message.source.html b/templates/zerver/emails/missed_message.source.html index 194bfe8c13..6e83b3bd20 100644 --- a/templates/zerver/emails/missed_message.source.html +++ b/templates/zerver/emails/missed_message.source.html @@ -37,7 +37,7 @@ {% else %} Reply in Zulip, or manage email preferences.

- Do not reply to this message. This Zulip server is not + Do not reply to this email. This Zulip server is not configured to accept incoming emails (help). {% endif %} diff --git a/templates/zerver/emails/missed_message.txt b/templates/zerver/emails/missed_message.txt index 5b4d180805..c36403ef28 100644 --- a/templates/zerver/emails/missed_message.txt +++ b/templates/zerver/emails/missed_message.txt @@ -33,7 +33,7 @@ View or reply in Zulip: Reply in Zulip: {{ narrow_url }} -Do not reply to this message. This Zulip server is not configured to accept +Do not reply to this email. This Zulip server is not configured to accept incoming emails. Help: https://zulip.readthedocs.io/en/latest/production/email-gateway.html {% endif %} diff --git a/version.py b/version.py index 746c136e17..d866173f27 100644 --- a/version.py +++ b/version.py @@ -26,4 +26,4 @@ LATEST_RELEASE_ANNOUNCEMENT = "https://blog.zulip.org/2019/12/13/zulip-2-1-relea # historical commits sharing the same major version, in which case a # minor version bump suffices. -PROVISION_VERSION = '67.2' +PROVISION_VERSION = '67.3' diff --git a/zerver/tests/test_email_notifications.py b/zerver/tests/test_email_notifications.py index 79ca484198..93fd291a81 100644 --- a/zerver/tests/test_email_notifications.py +++ b/zerver/tests/test_email_notifications.py @@ -335,7 +335,7 @@ class TestMissedMessages(ZulipTestCase): self.example_email('hamlet'), 'Extremely personal message!', ) - verify_body_include = ['Do not reply to this message.'] + verify_body_include = ['Do not reply to this email.'] email_subject = 'PMs with Othello, the Moor of Venice' self._test_cases(msg_id, verify_body_include, email_subject, send_as_user)