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

emails: Rename "missed message email" to "message notification email".

This commit is contained in:
Mateusz Mandera 2021-04-20 23:27:25 +02:00 committed by Tim Abbott
parent cc11575b21
commit 977a2f7fa0
17 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/production/email-gateway.md
View File

@ -4,8 +4,8 @@ Zulip's incoming email gateway integration makes it possible to send
messages into Zulip by sending an email. It's highly recommended
because it enables:
* When users reply to one of Zulip's missed message email
notifications from their email client, the reply can go directly
* When users reply to one of Zulip's message notification emails
from their email client, the reply can go directly
into Zulip.
* Integrating third-party services that can send email notifications
into Zulip. See the [integration

2
docs/production/requirements.md
View File

@ -125,7 +125,7 @@ certificate documentation](ssl-certificates.md).
* Outgoing email (SMTP) credentials that Zulip can use to send
outgoing emails to users (e.g. email address confirmation emails
during the signup process, missed message notifications, password
during the signup process, message notification emails, password
reset, etc.). If you don't have an existing outgoing SMTP solution,
read about
[free outgoing SMTP options and options for prototyping](email.html#free-outgoing-email-services).

2
docs/subsystems/email.md
View File

@ -4,7 +4,7 @@ This page has developer documentation on the Zulip email system. If you're
trying to configure your server to send email, you might be looking for our
guide to [sending outgoing email](../production/email.md). If you're trying to
configure an email integration to receive incoming email (e.g. so that users
can reply to missed message emails via email), you might be interested in
can reply to message notification emails via email), you might be interested in
our instructions for
[setting up an email integration](https://zulip.com/integrations/doc/email).

2
static/js/admin.js
View File

@ -30,7 +30,7 @@ const admin_settings_label = {
realm_default_twenty_four_hour_time: $t({defaultMessage: "Time format"}),
realm_send_welcome_emails: $t({defaultMessage: "Send emails introducing Zulip to new users"}),
realm_message_content_allowed_in_email_notifications: $t({
defaultMessage: "Allow message content in missed message emails",
defaultMessage: "Allow message content in message notification emails",
}),
realm_digest_emails_enabled: $t({
defaultMessage: "Send weekly digest emails to inactive users",

4
static/js/settings.js
View File

@ -55,10 +55,10 @@ function setup_settings_label() {
defaultMessage: "Send email notifications for new logins to my account",
}),
message_content_in_email_notifications: $t({
defaultMessage: "Include message content in missed message emails",
defaultMessage: "Include message content in message notification emails",
}),
realm_name_in_notifications: $t({
defaultMessage: "Include organization name in subject of missed message emails",
defaultMessage: "Include organization name in subject of message notification emails",
}),
presence_enabled: $t({
defaultMessage: "Display my availability to other users when online",

8
templates/zerver/help/configure-missed-message-emails.md
View File

@ -1,16 +1,16 @@
# Configure missed message emails
# Configure message notification emails
## Include organization name in subject line
If you belong to multiple Zulip organizations, it can be helpful to have the
name of the organization in the subject line of your missed message emails.
name of the organization in the subject line of your message notification emails.
{start_tabs}
{settings_tab|notifications}
1. Under **Other notification settings**, select
**Include organization name in subject of missed message emails**.
**Include organization name in subject of message notification emails**.
{end_tabs}
@ -29,6 +29,6 @@ being sent through your email.
{settings_tab|notifications}
1. Under **Other notification settings**, toggle
**Include message content in missed message emails**.
**Include message content in message notification emails**.
{end_tabs}

4
templates/zerver/help/hide-message-content-in-emails.md
View File

@ -4,7 +4,7 @@
For security or compliance reasons, you may want to prevent Zulip message
content from being sent through your email system. The only place Zulip
currently sends message content is in missed message email notifications.
currently sends message content is in message notification emails.
This setting also blocks message topics, stream names, and user names from
being sent through the email system.
@ -16,7 +16,7 @@ being sent through the email system.
{settings_tab|organization-settings}
1. Under **Other settings**, toggle
**Allow message content in missed message emails**.
**Allow message content in message notification emails**.
{end_tabs}

2
templates/zerver/help/include/sidebar_index.md
View File

@ -78,7 +78,7 @@
* [Mute a topic](/help/mute-a-topic)
* [Alert words](/help/add-an-alert-word)
* [Disable new login emails](/help/disable-new-login-emails)
* [Configure missed message emails](/help/configure-missed-message-emails)
* [Configure message notification emails](/help/configure-missed-message-emails)
* [Change notification sound](/help/change-notification-sound)
* [Troubleshoot desktop notifications](/help/troubleshooting-desktop-notifications)
* [Test mobile notifications](/help/test-mobile-notifications)

2
templates/zerver/help/message-a-stream-by-email.md
View File

@ -56,7 +56,7 @@ below by sending email to
text (like signatures). With this option, Zulip will include all footers.
* **.include-quotes**: In many email clients, when you reply to a message
(e.g. a missed message email), a copy of the original message is
(e.g. a message notification email), a copy of the original message is
automatically added to the bottom of your reply. By default, Zulip tries
to remove that copied message. With this option, Zulip will include it.

4
zerver/lib/email_mirror.py
View File

@ -225,7 +225,7 @@ def send_mm_reply_to_stream(
message_content=body,
)
except JsonableError as error:
error_message = "Error sending message to stream {stream} via missed messages email reply:\n{error}".format(
error_message = "Error sending message to stream {stream} via message notification email reply:\n{error}".format(
stream=stream.name, error=error.msg
)
internal_send_private_message(
@ -445,7 +445,7 @@ def process_missed_message(to: str, message: EmailMessage) -> None:
recipient = mm_address.message.recipient
if not is_user_active(user_profile):
logger.warning("Sending user is not active. Ignoring this missed message email.")
logger.warning("Sending user is not active. Ignoring this message notification email.")
return
body = construct_zulip_body(message, user_profile.realm)

4
zerver/lib/email_notifications.py
View File

@ -184,7 +184,7 @@ def build_message_list(
stream_map: Dict[int, Stream], # only needs id, name
) -> List[Dict[str, Any]]:
"""
Builds the message list object for the missed message email template.
Builds the message list object for the message notification email template.
The messages are collapsed into per-recipient and per-sender blocks, like
our web interface
"""
@ -506,7 +506,7 @@ def do_send_missedmessage_events_reply_in_zulip(
from_address = FromAddress.NOREPLY
if len(senders) == 1 and settings.SEND_MISSED_MESSAGE_EMAILS_AS_USER:
# If this setting is enabled, you can reply to the Zulip
# missed message emails directly back to the original sender.
# message notification emails directly back to the original sender.
# However, one must ensure the Zulip server is in the SPF
# record for the domain, or there will be spam/deliverability
# problems.

4
zerver/openapi/zulip.yaml
View File

@ -9089,7 +9089,7 @@ paths:
- name: message_content_in_email_notifications
in: query
description: |
Include the message's content in missed messages email notifications.
Include the message's content in email notifications for new messages.
schema:
type: boolean
example: true
@ -9128,7 +9128,7 @@ paths:
- name: realm_name_in_notifications
in: query
description: |
Include organization name in subject of missed message emails.
Include organization name in subject of message notification emails.
schema:
type: boolean
example: true

10
zerver/tests/test_email_mirror.py
View File

@ -794,7 +794,7 @@ class TestStreamEmailMessagesEmptyBody(ZulipTestCase):
class TestMissedMessageEmailMessages(ZulipTestCase):
def test_receive_missed_personal_message_email_messages(self) -> None:
# build dummy messages for missed messages email reply
# build dummy messages for message notification email reply
# have Hamlet send Othello a PM. Othello will reply via email
# Hamlet will receive the message.
self.login("hamlet")
@ -838,7 +838,7 @@ class TestMissedMessageEmailMessages(ZulipTestCase):
def test_receive_missed_huddle_message_email_messages(self) -> None:
# build dummy messages for missed messages email reply
# build dummy messages for message notification email reply
# have Othello send Iago and Cordelia a PM. Cordelia will reply via email
# Iago and Othello will receive the message.
self.login("othello")
@ -889,9 +889,9 @@ class TestMissedMessageEmailMessages(ZulipTestCase):
self.assertEqual(message.recipient.type, Recipient.HUDDLE)
def test_receive_missed_stream_message_email_messages(self) -> None:
# build dummy messages for missed messages email reply
# build dummy messages for message notification email reply
# have Hamlet send a message to stream Denmark, that Othello
# will receive a missed message email about.
# will receive a message notification email about.
# Othello will reply via email.
# Hamlet will see the message in the stream.
self.subscribe(self.example_user("hamlet"), "Denmark")
@ -970,7 +970,7 @@ class TestMissedMessageEmailMessages(ZulipTestCase):
self.assertEqual(
message.content,
"Error sending message to stream announce via missed messages email reply:\nOnly organization administrators can send to this stream.",
"Error sending message to stream announce via message notification email reply:\nOnly organization administrators can send to this stream.",
)
self.assertEqual(message.sender, get_system_bot(settings.NOTIFICATION_BOT))

2
zerver/tests/test_email_notifications.py
View File

@ -800,7 +800,7 @@ class TestMissedMessages(ZulipTestCase):
)
# When message content is not allowed at realm level
# Emails don't have missed message irrespective of message content setting of the user
# Emails don't have message content irrespective of message content setting of the user
realm = get_realm("zulip")
realm.message_content_allowed_in_email_notifications = False
realm.save(update_fields=["message_content_allowed_in_email_notifications"])

2
zerver/tests/test_message_edit_notifications.py
View File

@ -508,7 +508,7 @@ class EditMessageSideEffectsTest(ZulipTestCase):
self.assertEqual(info["enqueue_kwargs"], expected_enqueue_kwargs)
# Because Cordelia is FULLY present, we don't need to send any offline
# push notifications or missed message emails.
# push notifications or message notification emails.
self.assertEqual(len(info["queue_messages"]), 0)
def test_clear_notification_when_mention_removed(self) -> None:

2
zerver/tests/test_queue_worker.py
View File

@ -357,7 +357,7 @@ class WorkerTest(ZulipTestCase):
worker.start()
self.assertEqual(mock_mirror_email.call_count, 2)
# However, missed message emails don't get rate limited:
# However, message notification emails don't get rate limited:
with self.settings(EMAIL_GATEWAY_PATTERN="%s@example.com"):
address = "mm" + ("x" * 32) + "@example.com"
event = dict(

6
zerver/tests/test_signup.py
View File

@ -2563,10 +2563,10 @@ class EmailUnsubscribeTests(ZulipTestCase):
result = self.client_get(urllib.parse.urlparse(unsubscribe_link).path)
self.assert_in_response("Unknown email unsubscribe request", result)
def test_missedmessage_unsubscribe(self) -> None:
def test_message_notification_emails_unsubscribe(self) -> None:
"""
We provide one-click unsubscribe links in missed message
e-mails that you can click even when logged out to update your
We provide one-click unsubscribe links in message notification emails
that you can click even when logged out to update your
email notification settings.
"""
user_profile = self.example_user("hamlet")