diff --git a/frontend_tests/puppeteer_tests/admin.ts b/frontend_tests/puppeteer_tests/admin.ts index 08a6e2bee4..4ca6f238fc 100644 --- a/frontend_tests/puppeteer_tests/admin.ts +++ b/frontend_tests/puppeteer_tests/admin.ts @@ -314,11 +314,11 @@ async function test_organization_profile(page: Page): Promise { async function submit_default_user_settings(page: Page): Promise { assert.strictEqual( - await common.get_text_from_selector(page, "#org-submit-user-defaults"), + await common.get_text_from_selector(page, "#org-submit-notifications"), "Save changes", ); - await page.click("#org-submit-user-defaults"); - const saved_status = '#org-submit-user-defaults[data-status="saved"]'; + await page.click("#org-submit-notifications"); + const saved_status = '#org-submit-notifications[data-status="saved"]'; await page.waitForSelector(saved_status, {hidden: true}); } diff --git a/static/templates/settings/organization_settings_admin.hbs b/static/templates/settings/organization_settings_admin.hbs index 01564c168d..f4842f8c06 100644 --- a/static/templates/settings/organization_settings_admin.hbs +++ b/static/templates/settings/organization_settings_admin.hbs @@ -48,23 +48,16 @@ reset_button_text=(t '[Disable]') label=admin_settings_label.realm_signup_notifications_stream }} - - -
-
-

{{t "Default user settings" }}

- {{> settings_save_discard_widget section_name="user-defaults" }} -
-

{{t "Default settings for new users joining this organization." }}

-
-
- - -
+
+ +
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 5a702b22e5..0deec95663 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,27 +1,36 @@ -# Set the default language for new users +# Configure organization notifications language {!admin-only.md!} -Zulip has been translated or partially translated into a number of different -languages. You can see which languages Zulip supports, and help add support -for new languages on **[Transifex](https://www.transifex.com/zulip/zulip/)**. +Zulip has been translated or partially translated into dozens of +languages. You can see which languages Zulip supports, and help add +support for new languages on **[Transifex](https://www.transifex.com/zulip/zulip/)**. -If your organization usually uses a language other than English, you can set -a default language for new users. This setting will not affect existing -users, and new users can still -[manage their individual language setting](change-your-language). +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: -### Set the default language for new users +* 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). +* 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 {start_tabs} {settings_tab|organization-settings} -2. Under **Default user settings**, change the **Default language**. +2. Under **Notifications**, change the **Notifications language**. {!save-changes.md!} {end_tabs} -Note that users can always send and read messages in any language, regardless -of their language setting. +[api-create-user]: https://zulip.com/api/create-user diff --git a/templates/zerver/help/change-your-language.md b/templates/zerver/help/change-your-language.md index 60ad9ae3ea..eb8507aed3 100644 --- a/templates/zerver/help/change-your-language.md +++ b/templates/zerver/help/change-your-language.md @@ -1,11 +1,12 @@ # Change your language -Zulip has been translated or partially translated into a number of different -languages. You can see which languages Zulip supports, and help add support -for new languages on **[Transifex](https://www.transifex.com/zulip/zulip/)**. +Zulip has been translated or partially translated into dozens of +languages. You can see which languages Zulip supports, and help add +support for new languages on **[Transifex](https://www.transifex.com/zulip/zulip/)**. -If your entire organization speaks a language other than English, an administrator can -[set the default language][change-org-lang] for new users joining the organization. +If your organization has a primary language other than American +English, an administrator should also [set the organization +notifications language][change-org-lang]. [change-org-lang]: change-the-default-language-for-your-organization 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 6187dd86aa..0ce4ccfc0e 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 the default language for new users][change-default-language], - if it should be something other than US English. +* [Set organization notifications language][change-notifications-language], + if it should be something other than American English. -[change-default-language]: /help/change-the-default-language-for-your-organization +[change-notifications-language]: /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 6114648448..24cbe88afb 100755 --- a/templates/zerver/help/include/sidebar_index.md +++ b/templates/zerver/help/include/sidebar_index.md @@ -150,7 +150,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) -* [Set default language for new users](/help/change-the-default-language-for-your-organization) +* [Configure organization notifications 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/zerver/openapi/zulip.yaml b/zerver/openapi/zulip.yaml index 1b4c7a7d56..b4c662cfc4 100644 --- a/zerver/openapi/zulip.yaml +++ b/zerver/openapi/zulip.yaml @@ -10982,7 +10982,7 @@ paths: description: | Present if `realm` is present in `fetch_event_types`. - The default UI language for new users joining this organization. + The [notifications language for the organization](/help/change-the-default-language-for-your-organization). realm_description: type: string description: |