summaryrefslogtreecommitdiffstats
path: root/webapp/components/admin_console
diff options
context:
space:
mode:
authorlfbrock <lfbrock@users.noreply.github.com>2016-07-05 15:30:16 -0400
committerJoram Wilander <jwawilander@gmail.com>2016-07-05 15:30:16 -0400
commitb0514fb559b0d71ca5dd8e3a68fe4bdecba1ebd0 (patch)
treecbff7b714200a65880d820623117932814b4de2a /webapp/components/admin_console
parentf89e7c6d543a82d6078c2ca0f892914d7976a6f5 (diff)
downloadchat-b0514fb559b0d71ca5dd8e3a68fe4bdecba1ebd0.tar.gz
chat-b0514fb559b0d71ca5dd8e3a68fe4bdecba1ebd0.tar.bz2
chat-b0514fb559b0d71ca5dd8e3a68fe4bdecba1ebd0.zip
Update custom emoji help text (#3493)
* Update custom emoji help text * Update en.json
Diffstat (limited to 'webapp/components/admin_console')
-rw-r--r--webapp/components/admin_console/custom_emoji_settings.jsx8
1 files changed, 4 insertions, 4 deletions
diff --git a/webapp/components/admin_console/custom_emoji_settings.jsx b/webapp/components/admin_console/custom_emoji_settings.jsx
index 738afa3cd..78661e16e 100644
--- a/webapp/components/admin_console/custom_emoji_settings.jsx
+++ b/webapp/components/admin_console/custom_emoji_settings.jsx
@@ -54,8 +54,8 @@ export default class CustomEmojiSettings extends AdminSettings {
id='restrictCustomEmojiCreation'
values={[
{value: 'all', text: Utils.localizeMessage('admin.customization.restrictCustomEmojiCreationAll', 'Allow everyone to create custom emoji')},
- {value: 'admin', text: Utils.localizeMessage('admin.customization.restrictCustomEmojiCreationAdmin', 'Allow system and team admins to create custom emoji')},
- {value: 'system_admin', text: Utils.localizeMessage('admin.customization.restrictCustomEmojiCreationSystemAdmin', 'Only allow system admins to create custom emoji')}
+ {value: 'admin', text: Utils.localizeMessage('admin.customization.restrictCustomEmojiCreationAdmin', 'Allow System and Team Admins to create custom emoji')},
+ {value: 'system_admin', text: Utils.localizeMessage('admin.customization.restrictCustomEmojiCreationSystemAdmin', 'Only allow System Admins to create custom emoji')}
]}
label={
<FormattedMessage
@@ -89,7 +89,7 @@ export default class CustomEmojiSettings extends AdminSettings {
helpText={
<FormattedMessage
id='admin.customization.enableCustomEmojiDesc'
- defaultMessage='Enable users to create custom emoji for use in chat messages.'
+ defaultMessage='Enable users to create custom emoji for use in messages. When enabled, Custom Emoji settings can be accessed by switching to a team and clicking the three dots above the channel sidebar, and selecting "Custom Emoji".'
/>
}
value={this.state.enableCustomEmoji}
@@ -99,4 +99,4 @@ export default class CustomEmojiSettings extends AdminSettings {
</SettingsGroup>
);
}
-} \ No newline at end of file
+}