diff options
| author | lfbrock <lfbrock@users.noreply.github.com> | 2016-07-05 15:30:16 -0400 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2016-07-05 15:30:16 -0400 |
| commit | b0514fb559b0d71ca5dd8e3a68fe4bdecba1ebd0 (patch) | |
| tree | cbff7b714200a65880d820623117932814b4de2a | |
| parent | f89e7c6d543a82d6078c2ca0f892914d7976a6f5 (diff) | |
| download | chat-b0514fb559b0d71ca5dd8e3a68fe4bdecba1ebd0.tar.gz chat-b0514fb559b0d71ca5dd8e3a68fe4bdecba1ebd0.tar.bz2 chat-b0514fb559b0d71ca5dd8e3a68fe4bdecba1ebd0.zip | |
Update custom emoji help text (#3493)
* Update custom emoji help text
* Update en.json
| -rw-r--r-- | webapp/components/admin_console/custom_emoji_settings.jsx | 8 | ||||
| -rw-r--r-- | webapp/i18n/en.json | 6 |
2 files changed, 7 insertions, 7 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 +} diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index d6f340ab2..3677ec80e 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -147,12 +147,12 @@ "admin.connectionSecurityTlsDescription": "Encrypts the communication between Mattermost and your server.", "admin.customization.customBrand": "Custom Branding", "admin.customization.customEmoji": "Custom Emoji", - "admin.customization.enableCustomEmojiDesc": "Enable users to create custom emoji for use in chat messages.", + "admin.customization.enableCustomEmojiDesc": "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\".", "admin.customization.enableCustomEmojiTitle": "Enable Custom Emoji:", "admin.customization.restrictCustomEmojiCreationAll": "Allow everyone to create custom emoji", "admin.customization.restrictCustomEmojiCreationDesc": "Restrict the creation of custom emoji to certain users.", - "admin.customization.restrictCustomEmojiCreationAdmin": "Allow system and team admins to create custom emoji", - "admin.customization.restrictCustomEmojiCreationSystemAdmin": "Only allow system admins to create custom emoji", + "admin.customization.restrictCustomEmojiCreationAdmin": "Allow System and Team Admins to create custom emoji", + "admin.customization.restrictCustomEmojiCreationSystemAdmin": "Only allow System Admins to create custom emoji", "admin.customization.restrictCustomEmojiCreationTitle": "Restrict Custom Emoji Creation:", "admin.customization.support": "Legal and Support", "admin.database.title": "Database Settings", |