Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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:
palashb01 2023-03-07 20:40:59 +05:30 committed by Tim Abbott
parent f081c4abfd
commit dee63680df
9 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
help/configure-default-new-user-settings.md
View File

@ -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)

10
help/enable-emoticon-translations.md → help/configure-emoticon-translations.md
View File

@ -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
<img
src="/static/generated/emoji/images-google-64/1f642.png"
alt="smile"
@ -15,13 +15,13 @@ or
/>
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}

2
help/emoji-and-emoticons.md
View File

@ -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

2
help/format-your-message-using-markdown.md
View File

@ -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).
```

4
help/include/sidebar_index.md
View File

@ -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)

2
help/view-the-exact-time-a-message-was-sent.md
View File

@ -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)

2
tools/setup/emoji/emoji_setup_utils.py
View File

@ -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:",

1
zerver/lib/url_redirects.py
View File

@ -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"),
]

8
zerver/openapi/zulip.yaml
View File

@ -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