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

emails: Show realm_str inside bracket in subject.

Browse Source
This commit is contained in:
Vishnu Ks
2019-07-08 16:43:15 +05:30
committed by Tim Abbott
parent d23bcfa948
commit 3c464d9d63
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,5 +6,5 @@
{% else %} {% else %}
New missed messages New missed messages
{% endif %} {% endif %}
{% if realm_name_in_notifications %} in {{ realm_str }} {% if realm_name_in_notifications %} [{{ realm_str }}]
{% endif %} {% endif %}

2
version.py
View File

@@ -21,4 +21,4 @@ LATEST_RELEASE_ANNOUNCEMENT = "https://blog.zulip.org/2019/03/01/zulip-2-0-relea
# Typically, adding a dependency only requires a minor version bump, and # Typically, adding a dependency only requires a minor version bump, and
# removing a dependency requires a major version bump. # removing a dependency requires a major version bump.
PROVISION_VERSION = '37.2' PROVISION_VERSION = '37.3'

2
zerver/tests/test_email_notifications.py
View File

@@ -221,7 +221,7 @@ class TestMissedMessages(ZulipTestCase):
email_subject = 'PMs with Othello, the Moor of Venice' email_subject = 'PMs 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 in Zulip Dev' email_subject = 'PMs with Othello, the Moor of Venice [Zulip Dev]'
self._test_cases(tokens, msg_id, body, email_subject, False) self._test_cases(tokens, msg_id, body, email_subject, False)
@patch('zerver.lib.email_mirror.generate_random_token') @patch('zerver.lib.email_mirror.generate_random_token')