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

help: Rename and redirect message-a-stream-by-email for channel.

Browse Source
This commit is contained in:
Lauryn Menard
2024-04-30 21:51:09 +02:00
committed by Tim Abbott
parent bd91c82862
commit 9c353d812e
11 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api_docs/integrations-overview.md
View File

@@ -34,7 +34,7 @@ Zulip.
[Slack-compatible webhook API](/integrations/slack/slack_incoming).
* If the product can send email notifications, you can
[send those emails to a stream](/help/message-a-stream-by-email).
[send those emails to a stream](/help/message-a-channel-by-email).
## Write your own integration

6
help/email-notifications.md
View File

@@ -10,7 +10,7 @@ and mentions](/help/dm-mention-alert-notifications), as well as
{settings_tab|notifications}
1. Toggle the checkboxes for **Streams** and **DMs, mentions, and alerts**
1. Toggle the checkboxes for **Channels** and **DMs, mentions, and alerts**
in the **Email** column of the **Notification triggers** table.
{end_tabs}
@@ -75,7 +75,7 @@ Zulip messages from your email. Organization admins can do this at an
[organization-wide level](/help/hide-message-content-in-emails), but you can
also do this just for the messages you receive.
This setting also blocks message topics, stream names, and user names from
This setting also blocks message topics, channel names, and user names from
being sent through your email.
{start_tabs}
@@ -134,6 +134,6 @@ to Zulip Cloud users announcing major changes in Zulip.
## Related articles
* [Using Zulip via email](/help/using-zulip-via-email)
* [Message a stream by email](/help/message-a-stream-by-email)
* [Message a channel by email](/help/message-a-channel-by-email)
* [Stream notifications](/help/stream-notifications)
* [Hide message content in emails (for organizations)](/help/hide-message-content-in-emails)

2
help/include/sidebar_index.md
View File

@@ -90,7 +90,7 @@
* [Delete a message](/help/delete-a-message)
* [Draft messages](/help/view-and-edit-your-message-drafts)
* [Schedule a message](/help/schedule-a-message)
* [Message a stream by email](/help/message-a-stream-by-email)
* [Message a channel by email](/help/message-a-channel-by-email)
## Reading messages
* [Reading strategies](/help/reading-strategies)

10
help/message-a-stream-by-email.md → help/message-a-channel-by-email.md
View File

@@ -1,4 +1,4 @@
# Message a stream by email
# Message a channel by email
!!! tip ""
@@ -7,7 +7,7 @@
configured by a system administrator.
[email-gateway]: https://zulip.readthedocs.io/en/stable/production/email-gateway.html
You can send emails to Zulip streams. This can be useful:
You can send emails to Zulip channels. This can be useful:
* If you have an email that you want to discuss on Zulip
@@ -20,13 +20,13 @@ If you're planning on doing this in an automated way, and have some
programming experience, another option is to use our [send message
API](/api/send-message).
### Message a stream by email
### Message a channel by email
{start_tabs}
{relative|gear|stream-settings}
1. Select a stream.
1. Select a channel.
{!select-stream-view-general.md!}
@@ -34,7 +34,7 @@ API](/api/send-message).
1. Toggle the configuration options as desired.
1. Click **Copy address** to add the stream email address to your clipboard.
1. Click **Copy address** to add the channel email address to your clipboard.
1. Send an email to that address.

18
help/using-zulip-via-email.md
View File

@@ -4,26 +4,26 @@ With Zulip, it is possible for some members of your organization to participate
from their email client, without opening the Zulip app after the initial
setup is complete.
## Subscribe a Zulip stream to a mailing list
## Subscribe a Zulip channel to a mailing list
{start_tabs}
1. Create a mailing list to use with Zulip, or use an existing one.
2. Create a Zulip stream that will receive mailing list traffic, or
2. Create a Zulip channel that will receive mailing list traffic, or
use an existing one.
3. [Find the email address](/help/message-a-stream-by-email#message-a-stream-by-email_1)
for the stream you created. You can customize the details of how emails
3. [Find the email address](/help/message-a-channel-by-email#message-a-channel-by-email_1)
for the channel you created. You can customize the details of how emails
are formatted in Zulip using the
[Configuration options][configuration-options].
[configuration-options]: /help/message-a-stream-by-email#configuration-options
[configuration-options]: /help/message-a-channel-by-email#configuration-options
4. Add the email address for the stream to the mailing list.
4. Add the email address for the channel to the mailing list.
{end_tabs}
New emails sent to the email list will now be mirrored to the stream.
New emails sent to the email list will now be mirrored to the channel.
## Setup instructions for email users
@@ -31,7 +31,7 @@ If you want to interact with Zulip primarily (or entirely) via your email client
{start_tabs}
1. [Subscribe](/help/browse-and-subscribe-to-streams) to any streams you are
1. [Subscribe](/help/browse-and-subscribe-to-streams) to any channels you are
interested in.
{settings_tab|notifications}
@@ -51,4 +51,4 @@ conversation on Zulip.
## Related articles
* [Message a stream by email](/help/message-a-stream-by-email)
* [Message a channel by email](/help/message-a-channel-by-email)

2
templates/corporate/comparison_table_integrated.html
View File

@@ -615,7 +615,7 @@
</tr>
<tr>
<td class="comparison-table-feature">
<a href="https://zulip.com/help/message-a-stream-by-email">Email bridge integration</a>
<a href="/help/message-a-channel-by-email">Email bridge integration</a>
</td>
<td class="comparison-value-positive cloud-cell"><i class="icon icon-check"></i></td>
<td class="comparison-value-positive cloud-cell"><i class="icon icon-check"></i></td>

2
templates/zerver/integrations/email.md
View File

@@ -5,4 +5,4 @@ You can send emails to Zulip! This is useful:
* For integrating a third-party app that can send emails, but which does not
easily lend itself to more direct integration
Instructions are available [here](/help/message-a-stream-by-email).
Instructions are available [here](/help/message-a-channel-by-email).

2
web/src/stream_edit.js
View File

@@ -393,7 +393,7 @@ function show_stream_email_address_modal(address) {
id: "copy_email_address_modal",
html_submit_button: $t_html({defaultMessage: "Copy address"}),
html_exit_button: $t_html({defaultMessage: "Close"}),
help_link: "/help/message-a-stream-by-email#configuration-options",
help_link: "/help/message-a-channel-by-email#configuration-options",
on_click() {},
close_on_submit: false,
});

2
web/templates/stream_settings/stream_settings.hbs
View File

@@ -114,7 +114,7 @@
<label for="copy_stream_email_button" class="title inline-block">Email address</label>
<p class="field-hint">
{{t "You can use email to send messages to Zulip channels."}}
{{> ../help_link_widget link="/help/message-a-stream-by-email" }}
{{> ../help_link_widget link="/help/message-a-channel-by-email" }}
</p>
<button class="button small rounded copy_email_button" id="copy_stream_email_button" type="button">
<span class="copy_button">{{t "Generate email address" }}</span>

1
zerver/lib/url_redirects.py
View File

@@ -87,6 +87,7 @@ HELP_DOCUMENTATION_REDIRECTS: List[URLRedirect] = [
URLRedirect("/help/all-messages", "/help/combined-feed"),
URLRedirect("/help/create-streams", "/help/create-channels"),
URLRedirect("/help/create-a-stream", "/help/create-a-channel"),
URLRedirect("/help/message-a-stream-by-email", "/help/message-a-channel-by-email"),
]
LANDING_PAGE_REDIRECTS = [

4
zerver/tests/test_docs.py
View File

@@ -424,7 +424,7 @@ class HelpTest(ZulipTestCase):
self.assertNotIn("/stats", str(result.content))
def test_help_relative_links_for_stream(self) -> None:
result = self.client_get("/help/message-a-stream-by-email")
result = self.client_get("/help/message-a-channel-by-email")
self.assertIn(
'<a href="/#channels/subscribed"><i class="zulip-icon zulip-icon-hash"></i> Stream settings</a>',
str(result.content),
@@ -432,7 +432,7 @@ class HelpTest(ZulipTestCase):
self.assertEqual(result.status_code, 200)
with self.settings(ROOT_DOMAIN_LANDING_PAGE=True):
result = self.client_get("/help/message-a-stream-by-email", subdomain="")
result = self.client_get("/help/message-a-channel-by-email", subdomain="")
self.assertEqual(result.status_code, 200)
self.assertIn(
'<strong><i class="zulip-icon zulip-icon-hash"></i> Stream settings</strong>',