diff --git a/templates/corporate/features.html b/templates/corporate/features.html index de11955e62..186a331d59 100644 --- a/templates/corporate/features.html +++ b/templates/corporate/features.html @@ -181,7 +181,7 @@

Zulip has a powerful set of analytics available to help you see how your organization communicates.

- +

ONE-ON-ONE AND GROUP PRIVATE CONVERSATIONS

Lightweight private conversations with one or as many people as you need.

 diff --git a/templates/corporate/for/business.html b/templates/corporate/for/business.html index 4c1979b505..946cc6cafa 100644 --- a/templates/corporate/for/business.html +++ b/templates/corporate/for/business.html @@ -525,7 +525,7 @@
Mention users, groups of users - or everyone + or everyone when you need their attention.
diff --git a/templates/corporate/for/education.html b/templates/corporate/for/education.html index f199fbc6c0..705589f8bb 100644 --- a/templates/corporate/for/education.html +++ b/templates/corporate/for/education.html @@ -231,7 +231,7 @@
  • -
    Mention users, groups of users or everyone when you need their attention.
    +
    Mention users, groups of users or everyone when you need their attention.
  • Use Zulip in your language of choice, with translations into 23 languages.
    diff --git a/templates/corporate/for/events.html b/templates/corporate/for/events.html index 83ac2bff5f..05e1babecb 100644 --- a/templates/corporate/for/events.html +++ b/templates/corporate/for/events.html @@ -260,7 +260,7 @@
  • Zulip alerts participants about timely messages with fully customizable mobile, email and desktop notifications.
    • -
  • Mention users, groups of users or everyone when you need their attention.
    • +
  • Mention users, groups of users or everyone when you need their attention.
  • Zulip works reliably for organizations diff --git a/templates/corporate/for/open-source.html b/templates/corporate/for/open-source.html index f2290f8523..5ddbdbde4c 100644 --- a/templates/corporate/for/open-source.html +++ b/templates/corporate/for/open-source.html @@ -603,7 +603,7 @@
    Mention users, groups of users - or everyone + or everyone when you need their attention.
    • diff --git a/templates/corporate/for/research.html b/templates/corporate/for/research.html index 247f91a5cb..e24aa0a50f 100644 --- a/templates/corporate/for/research.html +++ b/templates/corporate/for/research.html @@ -353,7 +353,7 @@
    Mention users, groups of users - or everyone + or everyone when you need their attention.
    diff --git a/templates/zerver/emails/missed_message.html b/templates/zerver/emails/missed_message.html index 7eaa6f0605..163c614497 100644 --- a/templates/zerver/emails/missed_message.html +++ b/templates/zerver/emails/missed_message.html @@ -16,7 +16,7 @@ {% if message_content_disabled_by_realm %} {% trans help_url=realm_uri + "/help/hide-message-content-in-emails" %}This email does not include message content because your organization has disabled message content appearing in email notifications.{% endtrans %} {% elif message_content_disabled_by_user %} - {% trans alert_notif_url=realm_uri + "/help/pm-mention-alert-notifications" %}This email does not include message content because you have disabled message content appearing in email notifications.{% endtrans %} + {% trans alert_notif_url=realm_uri + "/help/dm-mention-alert-notifications" %}This email does not include message content because you have disabled message content appearing in email notifications.{% endtrans %} {% endif %} {% endif %} diff --git a/templates/zerver/emails/missed_message.txt b/templates/zerver/emails/missed_message.txt index da4cd74f94..f0dcb79043 100644 --- a/templates/zerver/emails/missed_message.txt +++ b/templates/zerver/emails/missed_message.txt @@ -13,7 +13,7 @@ This email does not include message content because your organization has disabl See {{ hide_content_url }} for more details. {% endtrans %} {% elif message_content_disabled_by_user %} -{% trans alert_notif_url=realm_uri + "/help/pm-mention-alert-notifications" %} +{% trans alert_notif_url=realm_uri + "/help/dm-mention-alert-notifications" %} This email does not include message content because you have disabled message content appearing in email notifications. See {{ alert_notif_url }} for more details. {% endtrans %} diff --git a/zerver/tests/test_message_notification_emails.py b/zerver/tests/test_message_notification_emails.py index 35557c1c6f..5094c2408d 100644 --- a/zerver/tests/test_message_notification_emails.py +++ b/zerver/tests/test_message_notification_emails.py @@ -190,7 +190,7 @@ class TestMessageNotificationEmails(ZulipTestCase): # Test in case if message content in missed email message are disabled. verify_body_include = [ "This email does not include message content because you have disabled message ", - "http://zulip.testserver/help/pm-mention-alert-notifications ", + "http://zulip.testserver/help/dm-mention-alert-notifications ", "View or reply in Zulip Dev Zulip", " Manage email preferences: http://zulip.testserver/#settings/notifications", ] @@ -250,7 +250,7 @@ class TestMessageNotificationEmails(ZulipTestCase): # Test in case if message content in missed email message are disabled. verify_body_include = [ "This email does not include message content because you have disabled message ", - "http://zulip.testserver/help/pm-mention-alert-notifications ", + "http://zulip.testserver/help/dm-mention-alert-notifications ", "View or reply in Zulip Dev Zulip", " Manage email preferences: http://zulip.testserver/#settings/notifications", ] @@ -290,7 +290,7 @@ class TestMessageNotificationEmails(ZulipTestCase): # Test in case if message content in missed email message are disabled. verify_body_include = [ "This email does not include message content because you have disabled message ", - "http://zulip.testserver/help/pm-mention-alert-notifications ", + "http://zulip.testserver/help/dm-mention-alert-notifications ", "View or reply in Zulip Dev Zulip", " Manage email preferences: http://zulip.testserver/#settings/notifications", ] @@ -349,7 +349,7 @@ class TestMessageNotificationEmails(ZulipTestCase): # Test in case if message content in missed email message are disabled. verify_body_include = [ "This email does not include message content because you have disabled message ", - "http://zulip.testserver/help/pm-mention-alert-notifications ", + "http://zulip.testserver/help/dm-mention-alert-notifications ", "View or reply in Zulip Dev Zulip", " Manage email preferences: http://zulip.testserver/#settings/notifications", ] @@ -389,7 +389,7 @@ class TestMessageNotificationEmails(ZulipTestCase): # Test in case if message content in missed email message are disabled. verify_body_include = [ "This email does not include message content because you have disabled message ", - "http://zulip.testserver/help/pm-mention-alert-notifications ", + "http://zulip.testserver/help/dm-mention-alert-notifications ", "View or reply in Zulip Dev Zulip", " Manage email preferences: http://zulip.testserver/#settings/notifications", ] @@ -504,7 +504,7 @@ class TestMessageNotificationEmails(ZulipTestCase): elif message_content_disabled_by_user: verify_body_include = [ "This email does not include message content because you have disabled message ", - "http://zulip.testserver/help/pm-mention-alert-notifications ", + "http://zulip.testserver/help/dm-mention-alert-notifications ", "View or reply in Zulip Dev Zulip", " Manage email preferences: http://zulip.testserver/#settings/notifications", ] @@ -565,7 +565,7 @@ class TestMessageNotificationEmails(ZulipTestCase): else: verify_body_include = [ "This email does not include message content because you have disabled message ", - "http://zulip.testserver/help/pm-mention-alert-notifications ", + "http://zulip.testserver/help/dm-mention-alert-notifications ", "View or reply in Zulip Dev Zulip", " Manage email preferences: http://zulip.testserver/#settings/notifications", ]