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

emails: Use the word email instead of message in do not reply sentence. 

Fixes #13693
This commit is contained in:
Vishnu KS 2020-01-31 19:08:57 +05:30 committed by Tim Abbott
parent bd460af099
commit db97e0e329
4 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

@ -37,7 +37,7 @@
{% else %} {% else %}
<a href="{{ narrow_url }}">Reply in Zulip</a>, or <a href="{{ realm_uri }}/#settings/notifications">manage email preferences</a>.<br> <a href="{{ narrow_url }}">Reply in Zulip</a>, or <a href="{{ realm_uri }}/#settings/notifications">manage email preferences</a>.<br>
<br> <br>
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 (<a href="https://zulip.readthedocs.io/en/latest/production/email-gateway.html">help</a>). configured to accept incoming emails (<a href="https://zulip.readthedocs.io/en/latest/production/email-gateway.html">help</a>).
{% endif %} {% endif %}

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

@ -33,7 +33,7 @@ View or reply in Zulip:
Reply in Zulip: Reply in Zulip:
{{ narrow_url }} {{ 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: incoming emails. Help:
https://zulip.readthedocs.io/en/latest/production/email-gateway.html https://zulip.readthedocs.io/en/latest/production/email-gateway.html
{% endif %} {% endif %}

2
version.py
View File

@ -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 # historical commits sharing the same major version, in which case a
# minor version bump suffices. # minor version bump suffices.
PROVISION_VERSION = '67.2' PROVISION_VERSION = '67.3'

2
zerver/tests/test_email_notifications.py
View File

@ -335,7 +335,7 @@ class TestMissedMessages(ZulipTestCase):
self.example_email('hamlet'), self.example_email('hamlet'),
'Extremely personal message!', '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' email_subject = 'PMs 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)