diff --git a/help/configure-default-new-user-settings.md b/help/configure-default-new-user-settings.md index c71205e992..0bd1687fff 100644 --- a/help/configure-default-new-user-settings.md +++ b/help/configure-default-new-user-settings.md @@ -20,6 +20,7 @@ preference settings, including the following: [All messages](/help/reading-strategies#all-messages)) * [Light theme vs. dark theme](/help/dark-theme) * [Emoji theme](/help/emoji-and-emoticons#change-your-emoji-set) + * [Time format](/help/change-the-time-format) * Notification settings, including: * [What types of messages trigger notifications][default-notifications] * [Configurations for email notifications](/help/email-notifications) diff --git a/help/enable-emoticon-translations.md b/help/configure-emoticon-translations.md similarity index 59% rename from help/enable-emoticon-translations.md rename to help/configure-emoticon-translations.md index 153ab3c5cb..d1bacf5b3e 100644 --- a/help/enable-emoticon-translations.md +++ b/help/configure-emoticon-translations.md @@ -1,7 +1,7 @@ -# Enable emoticon translation +# Configure emoticon translations -If you use emoticons like `:)` or `:/`, you can have them translated into -emoji equivalents like +If you use emoticons like `:)` or `:/`, you can configure whether to have them +translated into emoji equivalents like smile automatically by Zulip. -### Enable emoticon translations +## Configure emoticon translations {start_tabs} {settings_tab|display-settings} -1. Under **Emoji**, select **Convert emoticons before sending**. +1. Under **Emoji**, toggle **Convert emoticons before sending**. {end_tabs} diff --git a/help/emoji-and-emoticons.md b/help/emoji-and-emoticons.md index 240f21fb44..f1200650cb 100644 --- a/help/emoji-and-emoticons.md +++ b/help/emoji-and-emoticons.md @@ -48,7 +48,7 @@ Use `:)` and `:/` instead of typing `:smile:` and `:confused:`. {end_tabs} The list of supported emoticons is available -[here](/help/enable-emoticon-translations). +[here](/help/configure-emoticon-translations). ### Paste from another site diff --git a/help/format-your-message-using-markdown.md b/help/format-your-message-using-markdown.md index 82bc660a22..505d1bf150 100644 --- a/help/format-your-message-using-markdown.md +++ b/help/format-your-message-using-markdown.md @@ -176,7 +176,7 @@ Clicking the arrow will expand the spoiler content: ## Emoji and emoticons To translate emoticons into emoji, you'll need to -[enable emoticon translations](/help/enable-emoticon-translations). +[enable emoticon translations](/help/configure-emoticon-translations). You can also [add custom emoji](/help/custom-emoji). ``` diff --git a/help/include/sidebar_index.md b/help/include/sidebar_index.md index 6e53ecb090..1fe14bb4bd 100644 --- a/help/include/sidebar_index.md +++ b/help/include/sidebar_index.md @@ -49,8 +49,8 @@ * [Dark theme](/help/dark-theme) * [Change your language](/help/change-your-language) * [Change your time zone](/help/change-your-timezone) -* [Use 24-hour time](/help/change-the-time-format) -* [Enable emoticon translations](/help/enable-emoticon-translations) +* [Change the time format](/help/change-the-time-format) +* [Configure emoticon translations](/help/configure-emoticon-translations) * [Configure default view](/help/configure-default-view) * [Enable full width display](/help/enable-full-width-display) * [Manage your uploaded files](/help/manage-your-uploaded-files) diff --git a/help/view-the-exact-time-a-message-was-sent.md b/help/view-the-exact-time-a-message-was-sent.md index aca86c700e..2a13f86ac0 100644 --- a/help/view-the-exact-time-a-message-was-sent.md +++ b/help/view-the-exact-time-a-message-was-sent.md @@ -5,4 +5,4 @@ the timestamp to the right of the message. ## Related articles -* [Use 24-hour time](/help/change-the-time-format) +* [Change the time format](/help/change-the-time-format) diff --git a/tools/setup/emoji/emoji_setup_utils.py b/tools/setup/emoji/emoji_setup_utils.py index 14f87c4e6e..628e57c510 100644 --- a/tools/setup/emoji/emoji_setup_utils.py +++ b/tools/setup/emoji/emoji_setup_utils.py @@ -34,7 +34,7 @@ REMAPPED_EMOJIS = { } # Emoticons and which emoji they should become. Duplicate emoji are allowed. -# Changes here should be mimicked in `help/enable-emoticon-translations.md`. +# Changes here should be mimicked in `help/configure-emoticon-translations.md`. EMOTICON_CONVERSIONS = { ":)": ":smile:", "(:": ":smile:", diff --git a/zerver/lib/url_redirects.py b/zerver/lib/url_redirects.py index e9dcd37b17..b4b957bf76 100644 --- a/zerver/lib/url_redirects.py +++ b/zerver/lib/url_redirects.py @@ -72,6 +72,7 @@ HELP_DOCUMENTATION_REDIRECTS: List[URLRedirect] = [ ), URLRedirect("/help/add-custom-emoji", "/help/custom-emoji"), URLRedirect("/help/night-mode", "/help/dark-theme"), + URLRedirect("/help/enable-emoticon-translations", "/help/configure-emoticon-translations"), URLRedirect("/help/web-public-streams", "/help/public-access-option"), ] diff --git a/zerver/openapi/zulip.yaml b/zerver/openapi/zulip.yaml index 3d080d1a49..05efe1c863 100644 --- a/zerver/openapi/zulip.yaml +++ b/zerver/openapi/zulip.yaml @@ -8906,7 +8906,7 @@ paths: - name: translate_emoticons in: query description: | - Whether to [translate emoticons to emoji](/help/enable-emoticon-translations) + Whether to [translate emoticons to emoji](/help/configure-emoticon-translations) in messages the user sends. schema: type: boolean @@ -10933,7 +10933,7 @@ paths: translate_emoticons: type: boolean description: | - Whether to [translate emoticons to emoji](/help/enable-emoticon-translations) + Whether to [translate emoticons to emoji](/help/configure-emoticon-translations) in messages the user sends. display_emoji_reaction_users: type: boolean @@ -12874,7 +12874,7 @@ paths: translate_emoticons: type: boolean description: | - Whether to [translate emoticons to emoji](/help/enable-emoticon-translations) + Whether to [translate emoticons to emoji](/help/configure-emoticon-translations) in messages the user sends. display_emoji_reaction_users: type: boolean @@ -13853,7 +13853,7 @@ paths: - name: translate_emoticons in: query description: | - Whether to [translate emoticons to emoji](/help/enable-emoticon-translations) + Whether to [translate emoticons to emoji](/help/configure-emoticon-translations) in messages the user sends. **Changes**: Before Zulip 5.0 (feature level 80), this setting was managed by