mirror of https://github.com/zulip/zulip.git
docs: Update time format and Emoticon help page.
Updated the title and description in the 'enable-emoticon-translation' file and renamed the file accordingly. Added a new bullet point for 'time format' in the 'configure-new-user-settings.md' file and updated the sidebar index by replacing the title 'Use 24-hour time' with 'Change the time format'.
This commit is contained in:
parent
f081c4abfd
commit
dee63680df
|
@ -20,6 +20,7 @@ preference settings, including the following:
|
||||||
[All messages](/help/reading-strategies#all-messages))
|
[All messages](/help/reading-strategies#all-messages))
|
||||||
* [Light theme vs. dark theme](/help/dark-theme)
|
* [Light theme vs. dark theme](/help/dark-theme)
|
||||||
* [Emoji theme](/help/emoji-and-emoticons#change-your-emoji-set)
|
* [Emoji theme](/help/emoji-and-emoticons#change-your-emoji-set)
|
||||||
|
* [Time format](/help/change-the-time-format)
|
||||||
* Notification settings, including:
|
* Notification settings, including:
|
||||||
* [What types of messages trigger notifications][default-notifications]
|
* [What types of messages trigger notifications][default-notifications]
|
||||||
* [Configurations for email notifications](/help/email-notifications)
|
* [Configurations for email notifications](/help/email-notifications)
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
# Enable emoticon translation
|
# Configure emoticon translations
|
||||||
|
|
||||||
If you use emoticons like `:)` or `:/`, you can have them translated into
|
If you use emoticons like `:)` or `:/`, you can configure whether to have them
|
||||||
emoji equivalents like
|
translated into emoji equivalents like
|
||||||
<img
|
<img
|
||||||
src="/static/generated/emoji/images-google-64/1f642.png"
|
src="/static/generated/emoji/images-google-64/1f642.png"
|
||||||
alt="smile"
|
alt="smile"
|
||||||
|
@ -15,13 +15,13 @@ or
|
||||||
/>
|
/>
|
||||||
automatically by Zulip.
|
automatically by Zulip.
|
||||||
|
|
||||||
### Enable emoticon translations
|
## Configure emoticon translations
|
||||||
|
|
||||||
{start_tabs}
|
{start_tabs}
|
||||||
|
|
||||||
{settings_tab|display-settings}
|
{settings_tab|display-settings}
|
||||||
|
|
||||||
1. Under **Emoji**, select **Convert emoticons before sending**.
|
1. Under **Emoji**, toggle **Convert emoticons before sending**.
|
||||||
|
|
||||||
{end_tabs}
|
{end_tabs}
|
||||||
|
|
|
@ -48,7 +48,7 @@ Use `:)` and `:/` instead of typing `:smile:` and `:confused:`.
|
||||||
{end_tabs}
|
{end_tabs}
|
||||||
|
|
||||||
The list of supported emoticons is available
|
The list of supported emoticons is available
|
||||||
[here](/help/enable-emoticon-translations).
|
[here](/help/configure-emoticon-translations).
|
||||||
|
|
||||||
### Paste from another site
|
### Paste from another site
|
||||||
|
|
||||||
|
|
|
@ -176,7 +176,7 @@ Clicking the arrow will expand the spoiler content:
|
||||||
## Emoji and emoticons
|
## Emoji and emoticons
|
||||||
|
|
||||||
To translate emoticons into emoji, you'll need to
|
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).
|
You can also [add custom emoji](/help/custom-emoji).
|
||||||
|
|
||||||
```
|
```
|
||||||
|
|
|
@ -49,8 +49,8 @@
|
||||||
* [Dark theme](/help/dark-theme)
|
* [Dark theme](/help/dark-theme)
|
||||||
* [Change your language](/help/change-your-language)
|
* [Change your language](/help/change-your-language)
|
||||||
* [Change your time zone](/help/change-your-timezone)
|
* [Change your time zone](/help/change-your-timezone)
|
||||||
* [Use 24-hour time](/help/change-the-time-format)
|
* [Change the time format](/help/change-the-time-format)
|
||||||
* [Enable emoticon translations](/help/enable-emoticon-translations)
|
* [Configure emoticon translations](/help/configure-emoticon-translations)
|
||||||
* [Configure default view](/help/configure-default-view)
|
* [Configure default view](/help/configure-default-view)
|
||||||
* [Enable full width display](/help/enable-full-width-display)
|
* [Enable full width display](/help/enable-full-width-display)
|
||||||
* [Manage your uploaded files](/help/manage-your-uploaded-files)
|
* [Manage your uploaded files](/help/manage-your-uploaded-files)
|
||||||
|
|
|
@ -5,4 +5,4 @@ the timestamp to the right of the message.
|
||||||
|
|
||||||
## Related articles
|
## Related articles
|
||||||
|
|
||||||
* [Use 24-hour time](/help/change-the-time-format)
|
* [Change the time format](/help/change-the-time-format)
|
||||||
|
|
|
@ -34,7 +34,7 @@ REMAPPED_EMOJIS = {
|
||||||
}
|
}
|
||||||
|
|
||||||
# Emoticons and which emoji they should become. Duplicate emoji are allowed.
|
# 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 = {
|
EMOTICON_CONVERSIONS = {
|
||||||
":)": ":smile:",
|
":)": ":smile:",
|
||||||
"(:": ":smile:",
|
"(:": ":smile:",
|
||||||
|
|
|
@ -72,6 +72,7 @@ HELP_DOCUMENTATION_REDIRECTS: List[URLRedirect] = [
|
||||||
),
|
),
|
||||||
URLRedirect("/help/add-custom-emoji", "/help/custom-emoji"),
|
URLRedirect("/help/add-custom-emoji", "/help/custom-emoji"),
|
||||||
URLRedirect("/help/night-mode", "/help/dark-theme"),
|
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"),
|
URLRedirect("/help/web-public-streams", "/help/public-access-option"),
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
|
@ -8906,7 +8906,7 @@ paths:
|
||||||
- name: translate_emoticons
|
- name: translate_emoticons
|
||||||
in: query
|
in: query
|
||||||
description: |
|
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.
|
in messages the user sends.
|
||||||
schema:
|
schema:
|
||||||
type: boolean
|
type: boolean
|
||||||
|
@ -10933,7 +10933,7 @@ paths:
|
||||||
translate_emoticons:
|
translate_emoticons:
|
||||||
type: boolean
|
type: boolean
|
||||||
description: |
|
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.
|
in messages the user sends.
|
||||||
display_emoji_reaction_users:
|
display_emoji_reaction_users:
|
||||||
type: boolean
|
type: boolean
|
||||||
|
@ -12874,7 +12874,7 @@ paths:
|
||||||
translate_emoticons:
|
translate_emoticons:
|
||||||
type: boolean
|
type: boolean
|
||||||
description: |
|
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.
|
in messages the user sends.
|
||||||
display_emoji_reaction_users:
|
display_emoji_reaction_users:
|
||||||
type: boolean
|
type: boolean
|
||||||
|
@ -13853,7 +13853,7 @@ paths:
|
||||||
- name: translate_emoticons
|
- name: translate_emoticons
|
||||||
in: query
|
in: query
|
||||||
description: |
|
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.
|
in messages the user sends.
|
||||||
|
|
||||||
**Changes**: Before Zulip 5.0 (feature level 80), this setting was managed by
|
**Changes**: Before Zulip 5.0 (feature level 80), this setting was managed by
|
||||||
|
|
Loading…
Reference in New Issue