diff --git a/templates/zerver/help/change-the-default-language-for-your-organization.md b/templates/zerver/help/change-the-default-language-for-your-organization.md index b3e3837966..ceb796b70b 100644 --- a/templates/zerver/help/change-the-default-language-for-your-organization.md +++ b/templates/zerver/help/change-the-default-language-for-your-organization.md @@ -1,39 +1,43 @@ -# Configure organization notifications language +# Organization language for automated messages and invitation emails {!admin-only.md!} {!translation-project-info.md!} -Each user can use Zulip with [their preferred -language](/help/change-your-language). In addition, if your -organization has a primary language other than American English, you -can set the notifications language for the organization. This setting: +Each user can use Zulip with [their preferred language][user-lang]. +Additionally, if your organization has a primary language other than +American English, you can set the language used for the organization's +automated messages and invitation emails. This setting: * Determines the language used for automated messages sent to streams - by [Notification - Bot](/help/configure-notification-bot). (Notifications sent to a - single user will use that user's language). + by the [Zulip notification bot](/help/configure-notification-bot). + (Automated messages sent to a single user will use that user's + preferred language). + * Determines the language used for outgoing [invitation emails](/help/invite-new-users). + * Is used as the default language for new user accounts when Zulip cannot detect their language preferences from their browser, including all users [created via the Zulip API][api-create-user]. -## Configure the organization notifications language +## Configure the organization language {start_tabs} {settings_tab|organization-settings} -1. Under **Notifications**, change the **Notifications language**. +1. Under **Automated messages and emails**, change the **Language for + automated messages and invitation emails**. {!save-changes.md!} {end_tabs} -[api-create-user]: https://zulip.com/api/create-user - ## Related articles -* [Change your language](/help/change-your-language) +* [Change your language][user-lang] * [Configure multi-language search](/help/configure-multi-language-search) + +[api-create-user]: https://zulip.com/api/create-user +[user-lang]: /help/change-your-language diff --git a/templates/zerver/help/change-your-language.md b/templates/zerver/help/change-your-language.md index dad40d478b..ffb7a0076c 100644 --- a/templates/zerver/help/change-your-language.md +++ b/templates/zerver/help/change-your-language.md @@ -23,6 +23,6 @@ messages you receive. ## Related articles -* [Configure organization notifications language][change-org-lang] +* [Configure organization language for automated messages and invitation emails][org-lang] -[change-org-lang]: change-the-default-language-for-your-organization +[org-lang]: change-the-default-language-for-your-organization diff --git a/templates/zerver/help/configure-multi-language-search.md b/templates/zerver/help/configure-multi-language-search.md index 67d7e22acd..5315c2298a 100644 --- a/templates/zerver/help/configure-multi-language-search.md +++ b/templates/zerver/help/configure-multi-language-search.md @@ -14,5 +14,7 @@ for setup instructions. ## Related articles -* [Configure organization notifications language](/help/change-the-default-language-for-your-organization) +* [Configure organization language for automated messages and invitation emails][org-lang] * [Searching for messages](/help/search-for-messages) + +[org-lang]: change-the-default-language-for-your-organization diff --git a/templates/zerver/help/configure-notification-bot.md b/templates/zerver/help/configure-notification-bot.md index 74246075cf..ce3b96c04c 100644 --- a/templates/zerver/help/configure-notification-bot.md +++ b/templates/zerver/help/configure-notification-bot.md @@ -17,47 +17,49 @@ for some user specific events, such as [being subscribed to a stream][add-users-to-stream] by another user. Organization administrators can configure where (and whether) -[new stream](#new-stream-notifications) and -[new user](#new-user-notifications) announcement messages are sent. +[new stream](#new-stream-announcements) and +[new user](#new-user-announcements) announcement messages are sent. Stream messages sent by the notification bot (including the topic) are translated into the language that the organization has configured -as the [organization notifications language][org-notifications-lang]. -Notification bot messages sent to a single user will use -[their preferred language](/help/change-your-language). +as the [organization language for automated messages and invitation +emails][org-lang]. Notification bot messages sent to a single user will +use [their preferred language](/help/change-your-language). ## Configure notification bot {!admin-only.md!} -### New stream notifications +### New stream announcements You can configure where the Zulip notification bot [announces][new-stream-options] new public streams, or disable the new -stream notification messages entirely. The topic for these messages +stream announcement messages entirely. The topic for these messages is "new streams". {start_tabs} {settings_tab|organization-settings} -1. Under **Notifications**, configure **New stream notifications**. +1. Under **Automated messages and emails**, configure **New stream + announcements**. {!save-changes.md!} {end_tabs} -### New user notifications +### New user announcements You can configure where the Zulip notification bot announces new users, -or disable the new user notification messages entirely. The topic for +or disable the new user announcement messages entirely. The topic for these messages is "signups". {start_tabs} {settings_tab|organization-settings} -1. Under **Notifications**, configure **New user notifications**. +1. Under **Automated messages and emails**, configure **New user + announcements**. {!save-changes.md!} @@ -65,10 +67,10 @@ these messages is "signups". ## Related articles -* [Organization notifications language][org-notifications-lang] +* [Organization language for automated messages and invitation emails][org-lang] * [Streams and topics](/help/streams-and-topics) [add-users-to-stream]: /help/add-or-remove-users-from-a-stream#add-users-to-a-stream [api-create-user]: https://zulip.com/api/create-user [new-stream-options]: /help/create-a-stream#stream-options -[org-notifications-lang]: /help/change-the-default-language-for-your-organization +[org-lang]: /help/change-the-default-language-for-your-organization diff --git a/templates/zerver/help/create-a-stream.md b/templates/zerver/help/create-a-stream.md index 21d9ca02c5..30ea70aee9 100644 --- a/templates/zerver/help/create-a-stream.md +++ b/templates/zerver/help/create-a-stream.md @@ -39,8 +39,8 @@ There are several parameters you can set while creating a stream. All but * **Who can access the stream?**: See [Stream permissions](/help/stream-permissions). * **Announce stream**: Posts a message to `#general` advertising the new - stream. Organization administrators can change the stream used for stream - creation announcements. + stream. Organization administrators can change the stream used for [stream + creation announcements](/help/configure-notification-bot#new-stream-announcements). * **Who can post to the stream?**: See [Stream permissions](/help/stream-permissions). diff --git a/templates/zerver/help/digest-emails.md b/templates/zerver/help/digest-emails.md index aa55ea670c..f9b139e071 100644 --- a/templates/zerver/help/digest-emails.md +++ b/templates/zerver/help/digest-emails.md @@ -21,7 +21,7 @@ if `https://zulip.example.com` is your Zulip server URL. {settings_tab|organization-settings} -1. Under **Notifications**, toggle +1. Under **Automated messages and emails**, toggle **Send weekly digest emails to inactive users**. {end_tabs} diff --git a/templates/zerver/help/disable-welcome-emails.md b/templates/zerver/help/disable-welcome-emails.md index 21d2480692..534042e965 100644 --- a/templates/zerver/help/disable-welcome-emails.md +++ b/templates/zerver/help/disable-welcome-emails.md @@ -14,7 +14,7 @@ You can disable these emails if they don't make sense for your organization. {settings_tab|organization-settings} -1. Under **Notifications**, toggle +1. Under **Automated messages and emails**, toggle **Send emails introducing Zulip to new users**. {end_tabs} diff --git a/templates/zerver/help/include/customize-settings-for-new-users.md b/templates/zerver/help/include/customize-settings-for-new-users.md index 0ce4ccfc0e..a1ea821685 100644 --- a/templates/zerver/help/include/customize-settings-for-new-users.md +++ b/templates/zerver/help/include/customize-settings-for-new-users.md @@ -3,8 +3,8 @@ Customize settings for new users to get them off to a great start. * [Add custom profile fields](/help/add-custom-profile-fields). * [Configure default new user settings][default-user-settings]. * [Set default streams for new users](/help/set-default-streams-for-new-users). -* [Set organization notifications language][change-notifications-language], +* [Set organization language for automated messages and invitation emails][org-lang], if it should be something other than American English. -[change-notifications-language]: /help/change-the-default-language-for-your-organization +[org-lang]: /help/change-the-default-language-for-your-organization [default-user-settings]: /help/configure-default-new-user-settings diff --git a/templates/zerver/help/include/sidebar_index.md b/templates/zerver/help/include/sidebar_index.md index 352495a533..9fa2f05105 100755 --- a/templates/zerver/help/include/sidebar_index.md +++ b/templates/zerver/help/include/sidebar_index.md @@ -153,7 +153,7 @@ * [Deactivate or reactivate a user](/help/deactivate-or-reactivate-a-user) * [Add custom profile fields](/help/add-custom-profile-fields) * [Configure default new user settings](/help/configure-default-new-user-settings) -* [Configure organization notifications language](/help/change-the-default-language-for-your-organization) +* [Configure organization language](/help/change-the-default-language-for-your-organization) * [User groups](/help/user-groups) * [Restrict visibility of email addresses](/help/restrict-visibility-of-email-addresses) * [Change a user's role](/help/change-a-users-role) diff --git a/templates/zerver/help/invite-new-users.md b/templates/zerver/help/invite-new-users.md index 772793f929..54b2b520ac 100644 --- a/templates/zerver/help/invite-new-users.md +++ b/templates/zerver/help/invite-new-users.md @@ -8,8 +8,8 @@ Prior to inviting users to your organization, it is recommended that administrat * Configure [default settings](/help/configure-default-new-user-settings) for new users. -* Configure the [notifications language][org-notifications-language] for your - organization, which is used for email invitations. +* Configure the [organization language for automated messages and invitation + emails][org-lang] for your organization. When you invite users, you can: @@ -95,7 +95,7 @@ for invitations for the organization owners role. * [Restrict account creation](/help/restrict-account-creation) * [Set default streams for new users](/help/set-default-streams-for-new-users) * [Configure default new user settings](/help/configure-default-new-user-settings) -* [Configure organization notifications language][org-notifications-language] +* [Configure organization language for automated messages and invitation emails][org-lang] * [Roles and permissions](/help/roles-and-permissions) -[org-notifications-language]: /help/change-the-default-language-for-your-organization +[org-lang]: /help/change-the-default-language-for-your-organization diff --git a/zerver/openapi/zulip.yaml b/zerver/openapi/zulip.yaml index eea57d7bed..ce19b10583 100644 --- a/zerver/openapi/zulip.yaml +++ b/zerver/openapi/zulip.yaml @@ -10917,7 +10917,9 @@ paths: description: | Present if `realm` is present in `fetch_event_types`. - The [notifications language for the organization](/help/change-the-default-language-for-your-organization). + The [organization language][org-lang] for automated messages and invitation emails. + + [org-lang]: /help/change-the-default-language-for-your-organization realm_description: type: string description: | @@ -11677,22 +11679,29 @@ paths: description: | Present if `realm` is present in `fetch_event_types`. - The ID of the stream to which notifications announcing the - creation of new streams are sent. -1 if such notifications are disabled. + The ID of the stream to which automated messages announcing the + [creation of new streams][new-stream-announce] are sent. - Since these notifications are sent by the server, this field is + Will be `-1` if such automated messages are disabled. + + Since these automated messages are sent by the server, this field is primarily relevant to clients containing UI for changing it. + + [new-stream-announce]: /help/configure-notification-bot#new-stream-announcements realm_signup_notifications_stream_id: type: integer description: | Present if `realm` is present in `fetch_event_types`. - The ID of the stream to which notifications announcing - that new users have joined the organization are sent. - -1 if such notifications are disabled. + The ID of the stream to which automated messages announcing + that [new users have joined the organization][new-user-announce] are sent. - Since these notifications are sent by the server, this field is + Will be `-1` if such automated messages are disabled. + + Since these automated messages are sent by the server, this field is primarily relevant to clients containing UI for changing it. + + [new-user-announce]: /help/configure-notification-bot#new-user-announcements realm_user_settings_defaults: type: object additionalProperties: false