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

help: Rename add-custom-emoji -> custom-emoji.

This commit is contained in:
Alya Abbott 2021-09-17 15:52:26 -07:00 committed by Tim Abbott
parent 1ee482ba9a
commit 302aba035a
15 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
templates/zerver/for-companies.html
View File

@ -343,7 +343,7 @@
Use <a href="/help/emoji-reactions">emoji
reactions</a> for lightweight
interactions. Have fun
with <a href="/help/add-custom-emoji">custom
with <a href="/help/custom-emoji">custom
emoji</a> and gather feedback
with <a href="/help/create-a-poll">polls</a>.
</div>

2
templates/zerver/for-education.html
View File

@ -122,7 +122,7 @@
Use <a href="/help/emoji-reactions">emoji
reactions</a> for lightweight
interactions. Have fun
with <a href="/help/add-custom-emoji">custom
with <a href="/help/custom-emoji">custom
emoji</a> and gather feedback
with <a href="/help/create-a-poll">polls</a>.
</div>

2
templates/zerver/for-events.html
View File

@ -115,7 +115,7 @@
<ul>
<li><div class="list-content">Share the agenda and presentations with
<a href="/help/share-and-upload-files">drag-and-drop file uploads</a>.</div></li>
<li><div class="list-content">Use <a href="/help/emoji-reactions">emoji reactions</a> for lightweight interactions. Have fun with <a href="/help/add-custom-emoji">custom emoji</a>, or get feedback with a <a href="/help/create-a-poll">poll</a>.</div></li>
<li><div class="list-content">Use <a href="/help/emoji-reactions">emoji reactions</a> for lightweight interactions. Have fun with <a href="/help/custom-emoji">custom emoji</a>, or get feedback with a <a href="/help/create-a-poll">poll</a>.</div></li>
<li><div class="list-content">Announce the schedule without worrying about time zones using <a href="/help/format-your-message-using-markdown#mention-a-time">local times</a>.</div></li>
<li><div class="list-content">Make a <a href="/help/start-a-call">video call</a> with the click of a button.</div></li>
<li><div class="list-content">Use Zulip in your language of choice, with translations into <a href="https://www.transifex.com/zulip/zulip/">17 languages</a>.</div></li>

2
templates/zerver/for-research.html
View File

@ -200,7 +200,7 @@
Use <a href="/help/emoji-reactions">emoji
reactions</a> for lightweight
interactions. Have fun
with <a href="/help/add-custom-emoji">custom
with <a href="/help/custom-emoji">custom
emoji</a> and gather feedback
with <a href="/help/create-a-poll">polls</a>.
</div>

2
templates/zerver/help/configure-who-can-add-custom-emoji.md
View File

@ -2,7 +2,7 @@
{!admin-only.md!}
By default, anyone other than guests can [add custom emoji](/help/add-custom-emoji) to the
By default, anyone other than guests can [add custom emoji](/help/custom-emoji) to the
organization. However, you can restrict the permission to add custom emoji to other sets of
roles:

2
templates/zerver/help/add-custom-emoji.md → templates/zerver/help/custom-emoji.md
View File

@ -1,4 +1,4 @@
# Add custom emoji
# Custom emoji
By default, anyone other than guests can add custom emoji to a Zulip organization. Added emoji
are available to all users.

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

@ -71,6 +71,6 @@ you send. The default is **Google modern**.
## Related articles
* [Add custom emoji](/help/add-custom-emoji)
* [Add custom emoji](/help/custom-emoji)
* [Emoji reactions](/help/emoji-reactions)
* [View emoji as text](/help/view-emoji-as-text)

4
templates/zerver/help/emoji-reactions.md
View File

@ -2,7 +2,7 @@
Emoji reactions allow you to react to messages with fun little emoji. Any
emoji can be used as a reaction, including
[custom emoji](/help/add-custom-emoji). Reactions appear in little boxes
[custom emoji](/help/custom-emoji). Reactions appear in little boxes
underneath the message.
## Add a reaction
@ -41,6 +41,6 @@ added to remove it.
## Related articles
* [Add custom emoji](/help/add-custom-emoji)
* [Add custom emoji](/help/custom-emoji)
* [View emoji reactions as text](/help/view-emoji-as-text)
* [Emoji in messages](/help/emoji-and-emoticons)

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

@ -173,7 +173,7 @@ Clicking the arrow will expand the spoiler content:
To translate emoticons into emoji, you'll need to
[enable emoticon translations](/help/enable-emoticon-translations).
You can also [add custom emoji](/help/add-custom-emoji).
You can also [add custom emoji](/help/custom-emoji).
```
:octopus: :heart: :zulip: :)

2
templates/zerver/help/include/customize-organization-settings.md
View File

@ -25,7 +25,7 @@ A few settings to highlight:
linkifiers](/help/add-a-custom-linkifier) to make it easy to link to
issues (e.g. just by typing #1234 for issue 1234).
* [Add custom emoji](/help/add-custom-emoji), including your organization's logo.
* [Add custom emoji](/help/custom-emoji), including your organization's logo.
For many other settings, e.g. [message and topic editing
permissions][topic-editing-permissions], you can experience how Zulip

2
templates/zerver/help/include/sidebar_index.md
View File

@ -170,7 +170,7 @@
* [Delete a topic](/help/delete-a-topic)
## Organization settings
* [Add custom emoji](/help/add-custom-emoji)
* [Custom emoji](/help/custom-emoji)
* [Add a custom linkifier](/help/add-a-custom-linkifier)
* [Restrict topic editing](/help/configure-who-can-edit-topics)
* [Require topics in stream messages](/help/require-topics)

2
templates/zerver/help/moderating-open-organizations.md
View File

@ -51,7 +51,7 @@ organization's policy choices.
* [Change users' names](/help/change-a-users-name) (e.g. to "Name (Spammer)")
for users who sent spam private messages to many community members.
* [Deactivate bots](/help/deactivate-or-reactivate-a-bot) or
[delete custom emoji](/help/add-custom-emoji#delete-custom-emoji).
[delete custom emoji](/help/custom-emoji#delete-custom-emoji).
## In the works

1
zerver/lib/test_helpers.py
View File

@ -469,6 +469,7 @@ def write_instrumentation_reports(full_suite: bool, include_webhooks: bool) -> N
"confirmation_key/",
"node-coverage/(?P<path>.+)",
"docs/(?P<path>.+)",
"help/add-custom-emoji",
"help/change-the-topic-of-a-message",
"help/configure-missed-message-emails",
"help/community-topic-edits",

8
zerver/openapi/zulip.yaml
View File

@ -2825,7 +2825,7 @@ paths:
additionalProperties: false
description: |
Event sent to all users in a Zulip organization when
a [custom emoji](/help/add-custom-emoji) has been updated,
a [custom emoji](/help/custom-emoji) has been updated,
typically when a new emoji has been added or an old one
has been deactivated. The event contains all custom emoji
configured for the organization, not just the updated
@ -6368,7 +6368,7 @@ paths:
- `unicode_emoji`: Unicode emoji (`emoji_code` will be its Unicode
codepoint).
- `realm_emoji`: [Custom emoji](/help/add-custom-emoji).
- `realm_emoji`: [Custom emoji](/help/custom-emoji).
(`emoji_code` will be its ID).
- `zulip_extra_emoji`: Special emoji included with Zulip. Exists to
namespace the `zulip` emoji.
@ -14133,7 +14133,7 @@ components:
- `unicode_emoji`: Unicode emoji (`emoji_code` will be its Unicode
codepoint).
- `realm_emoji`: [Custom emoji](/help/add-custom-emoji).
- `realm_emoji`: [Custom emoji](/help/custom-emoji).
(`emoji_code` will be its ID).
- `zulip_extra_emoji`: Special emoji included with Zulip. Exists to
namespace the `zulip` emoji.
@ -15205,7 +15205,7 @@ components:
namespace the `zulip` emoji.
**Changes**: In Zulip 3.0 (feature level 2), this become
optional for [custom emoji](/help/add-custom-emoji);
optional for [custom emoji](/help/custom-emoji);
previously, this endpoint assumed `unicode_emoji` if this
parameter was not specified.
schema:

4
zproject/urls.py
View File

@ -775,6 +775,10 @@ urls += [
"help/only-allow-admins-to-add-emoji",
RedirectView.as_view(url="/help/configure-who-can-add-custom-emoji", permanent=True),
),
path(
"help/add-custom-emoji",
RedirectView.as_view(url="/help/custom-emoji", permanent=True),
),
path("help/", help_documentation_view),
path("help/<path:article>", help_documentation_view),
path("api/", api_documentation_view),