paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-05 22:43:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

docs: Fix help links for pm -> dm rename, to save a redirect.

Browse Source
This commit is contained in:
Alex Vandiver
2024-01-11 21:14:59 +00:00
committed by Tim Abbott
parent eefe147c34
commit c217280c23
9 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
templates/corporate/features.html
View File

@@ -181,7 +181,7 @@
<p>Zulip has a powerful set of analytics available to <p>Zulip has a powerful set of analytics available to
help you see how your organization communicates.</p> help you see how your organization communicates.</p>
</a> </a>
<a class="feature-block" href="/help/private-messages" target="_blank" rel="noopener noreferrer"> <a class="feature-block" href="/help/direct-messages" target="_blank" rel="noopener noreferrer">
<h3>ONE-ON-ONE AND GROUP PRIVATE CONVERSATIONS</h3> <h3>ONE-ON-ONE AND GROUP PRIVATE CONVERSATIONS</h3>
<p>Lightweight private conversations with one or as many people as you need.</p> <p>Lightweight private conversations with one or as many people as you need.</p>
</a> </a>

2
templates/corporate/for/business.html
View File

@@ -525,7 +525,7 @@
<div class="list-content"> <div class="list-content">
Mention <a href="/help/mention-a-user-or-group">users</a>, <a href="/help/user-groups">groups Mention <a href="/help/mention-a-user-or-group">users</a>, <a href="/help/user-groups">groups
of users</a> of users</a>
or <a href="/help/pm-mention-alert-notifications#wildcard-mentions">everyone</a> or <a href="/help/dm-mention-alert-notifications#wildcard-mentions">everyone</a>
when you need their attention. when you need their attention.
</div> </div>
</li> </li>

2
templates/corporate/for/education.html
View File

@@ -231,7 +231,7 @@
</div> </div>
</li> </li>
<li> <li>
<div class="list-content">Mention <a href="/help/mention-a-user-or-group">users</a>, <a href="/help/user-groups">groups of users</a> or <a href="/help/pm-mention-alert-notifications#wildcard-mentions">everyone</a> when you need their attention.</div> <div class="list-content">Mention <a href="/help/mention-a-user-or-group">users</a>, <a href="/help/user-groups">groups of users</a> or <a href="/help/dm-mention-alert-notifications#wildcard-mentions">everyone</a> when you need their attention.</div>
</li> </li>
<li> <li>
<div class="list-content">Use Zulip in your language of choice, with translations into <a href="https://explore.transifex.com/zulip/zulip/">23 languages</a>.</div> <div class="list-content">Use Zulip in your language of choice, with translations into <a href="https://explore.transifex.com/zulip/zulip/">23 languages</a>.</div>

2
templates/corporate/for/events.html
View File

@@ -260,7 +260,7 @@
</div> </div>
</li> </li>
<li><div class="list-content">Zulip alerts participants about timely messages with <a href="/help/stream-notifications">fully customizable</a> mobile, email and desktop notifications.</div></li> <li><div class="list-content">Zulip alerts participants about timely messages with <a href="/help/stream-notifications">fully customizable</a> mobile, email and desktop notifications.</div></li>
<li><div class="list-content">Mention <a href="/help/mention-a-user-or-group">users</a>, <a href="/help/user-groups">groups of users</a> or <a href="/help/pm-mention-alert-notifications#wildcard-mentions">everyone</a> when you need their attention.</div></li> <li><div class="list-content">Mention <a href="/help/mention-a-user-or-group">users</a>, <a href="/help/user-groups">groups of users</a> or <a href="/help/dm-mention-alert-notifications#wildcard-mentions">everyone</a> when you need their attention.</div></li>
<li> <li>
<div class="list-content"> <div class="list-content">
Zulip works reliably for organizations Zulip works reliably for organizations

2
templates/corporate/for/open-source.html
View File

@@ -603,7 +603,7 @@
<div class="list-content"> <div class="list-content">
Mention <a href="/help/mention-a-user-or-group">users</a>, <a href="/help/user-groups">groups Mention <a href="/help/mention-a-user-or-group">users</a>, <a href="/help/user-groups">groups
of users</a> of users</a>
or <a href="/help/pm-mention-alert-notifications#wildcard-mentions">everyone</a> or <a href="/help/dm-mention-alert-notifications#wildcard-mentions">everyone</a>
when you need their attention. when you need their attention.
</div> </div>
</li> </li>

2
templates/corporate/for/research.html
View File

@@ -353,7 +353,7 @@
<div class="list-content"> <div class="list-content">
Mention <a href="/help/mention-a-user-or-group">users</a>, <a href="/help/user-groups">groups Mention <a href="/help/mention-a-user-or-group">users</a>, <a href="/help/user-groups">groups
of users</a> of users</a>
or <a href="/help/pm-mention-alert-notifications#wildcard-mentions">everyone</a> or <a href="/help/dm-mention-alert-notifications#wildcard-mentions">everyone</a>
when you need their attention. when you need their attention.
</div> </div>
</li> </li>

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

@@ -16,7 +16,7 @@
{% if message_content_disabled_by_realm %} {% 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 <a class="content_disabled_help_link" href="{{ help_url }}">message content appearing in email notifications</a>.{% endtrans %} {% trans help_url=realm_uri + "/help/hide-message-content-in-emails" %}This email does not include message content because your organization has disabled <a class="content_disabled_help_link" href="{{ help_url }}">message content appearing in email notifications</a>.{% endtrans %}
{% elif message_content_disabled_by_user %} {% 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 <a class="content_disabled_help_link" href="{{ alert_notif_url }}">message content appearing in email notifications</a>.{% endtrans %} {% trans alert_notif_url=realm_uri + "/help/dm-mention-alert-notifications" %}This email does not include message content because you have disabled <a class="content_disabled_help_link" href="{{ alert_notif_url }}">message content appearing in email notifications</a>.{% endtrans %}
{% endif %} {% endif %}
</div> </div>
{% endif %} {% endif %}

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

@@ -13,7 +13,7 @@ This email does not include message content because your organization has disabl
See {{ hide_content_url }} for more details. See {{ hide_content_url }} for more details.
{% endtrans %} {% endtrans %}
{% elif message_content_disabled_by_user %} {% 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. This email does not include message content because you have disabled message content appearing in email notifications.
See {{ alert_notif_url }} for more details. See {{ alert_notif_url }} for more details.
{% endtrans %} {% endtrans %}

14
zerver/tests/test_message_notification_emails.py
View File

@@ -190,7 +190,7 @@ class TestMessageNotificationEmails(ZulipTestCase):
# Test in case if message content in missed email message are disabled. # Test in case if message content in missed email message are disabled.
verify_body_include = [ verify_body_include = [
"This email does not include message content because you have disabled message ", "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", "View or reply in Zulip Dev Zulip",
" Manage email preferences: http://zulip.testserver/#settings/notifications", " 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. # Test in case if message content in missed email message are disabled.
verify_body_include = [ verify_body_include = [
"This email does not include message content because you have disabled message ", "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", "View or reply in Zulip Dev Zulip",
" Manage email preferences: http://zulip.testserver/#settings/notifications", " 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. # Test in case if message content in missed email message are disabled.
verify_body_include = [ verify_body_include = [
"This email does not include message content because you have disabled message ", "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", "View or reply in Zulip Dev Zulip",
" Manage email preferences: http://zulip.testserver/#settings/notifications", " 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. # Test in case if message content in missed email message are disabled.
verify_body_include = [ verify_body_include = [
"This email does not include message content because you have disabled message ", "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", "View or reply in Zulip Dev Zulip",
" Manage email preferences: http://zulip.testserver/#settings/notifications", " 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. # Test in case if message content in missed email message are disabled.
verify_body_include = [ verify_body_include = [
"This email does not include message content because you have disabled message ", "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", "View or reply in Zulip Dev Zulip",
" Manage email preferences: http://zulip.testserver/#settings/notifications", " Manage email preferences: http://zulip.testserver/#settings/notifications",
] ]
@@ -504,7 +504,7 @@ class TestMessageNotificationEmails(ZulipTestCase):
elif message_content_disabled_by_user: elif message_content_disabled_by_user:
verify_body_include = [ verify_body_include = [
"This email does not include message content because you have disabled message ", "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", "View or reply in Zulip Dev Zulip",
" Manage email preferences: http://zulip.testserver/#settings/notifications", " Manage email preferences: http://zulip.testserver/#settings/notifications",
] ]
@@ -565,7 +565,7 @@ class TestMessageNotificationEmails(ZulipTestCase):
else: else:
verify_body_include = [ verify_body_include = [
"This email does not include message content because you have disabled message ", "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", "View or reply in Zulip Dev Zulip",
" Manage email preferences: http://zulip.testserver/#settings/notifications", " Manage email preferences: http://zulip.testserver/#settings/notifications",
] ]