From fda65b3b378da89d2792f0d2af5f3bc922c49d12 Mon Sep 17 00:00:00 2001 From: Rishi Gupta Date: Thu, 4 May 2017 16:12:22 -0700 Subject: [PATCH] missed messages: Change subject to always use the plural for Zulips. Works better for threading in email clients. --- zerver/lib/notifications.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/zerver/lib/notifications.py b/zerver/lib/notifications.py index ad2c1842bb..03eb68b53e 100644 --- a/zerver/lib/notifications.py +++ b/zerver/lib/notifications.py @@ -278,9 +278,8 @@ def do_send_missedmessage_events_reply_in_zulip(user_profile, missed_messages, m senders = set(m.sender.full_name for m in missed_messages) sender_str = ", ".join(senders) - plural_messages = 's' if len(missed_messages) > 1 else '' - subject = "Missed Zulip%s from %s" % (plural_messages, sender_str) + subject = "Missed Zulips from %s" % (sender_str,) from_email = 'Zulip <%s>' % (settings.NOREPLY_EMAIL_ADDRESS,) if len(senders) == 1 and settings.SEND_MISSED_MESSAGE_EMAILS_AS_USER: # If this setting is enabled, you can reply to the Zulip