diff options
| author | Harrison Healey <harrisonmhealey@gmail.com> | 2016-07-22 10:54:03 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-22 10:54:03 -0400 |
| commit | 6496205461c58b21d8ee33733b234c31ef1b36f2 (patch) | |
| tree | 5da45c2dbac5f0d700aee92540793e4563095ba8 /webapp | |
| parent | 9c2c941449c387b2407d10c101f39a2266a2e65a (diff) | |
| download | chat-6496205461c58b21d8ee33733b234c31ef1b36f2.tar.gz chat-6496205461c58b21d8ee33733b234c31ef1b36f2.tar.bz2 chat-6496205461c58b21d8ee33733b234c31ef1b36f2.zip | |
Updated custom emoji help text (#3653)
Diffstat (limited to 'webapp')
| -rw-r--r-- | webapp/components/emoji/components/emoji_list.jsx | 16 | ||||
| -rw-r--r-- | webapp/i18n/en.json | 3 |
2 files changed, 14 insertions, 5 deletions
diff --git a/webapp/components/emoji/components/emoji_list.jsx b/webapp/components/emoji/components/emoji_list.jsx index 257cc567f..273fc8a25 100644 --- a/webapp/components/emoji/components/emoji_list.jsx +++ b/webapp/components/emoji/components/emoji_list.jsx @@ -141,10 +141,18 @@ export default class EmojiList extends React.Component { </div> </div> <span className='backstage-list__help'> - <FormattedMessage - id='emoji_list.help' - defaultMessage='Custom emoji are available to everyone on your server and will appear in the emoji autocomplete menu. Other users may need to refresh the page before new emojis appear.' - /> + <p> + <FormattedMessage + id='emoji_list.help' + defaultMessage="Custom emoji are available to everyone on your server. Type ':' in a message box to bring up the emoji selection menu. Other users may need to refresh the page before new emojis appear." + /> + </p> + <p> + <FormattedMessage + id='emoji_list.help2' + defaultMessage="Tip: If you add #, ##, or ### as the first character on a new line containing emoji, you can use larger sized emoji. To try it out, send a message such as: '# :smile:'." + /> + </p> </span> <div className='backstage-list'> <table className='emoji-list__table'> diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index ad1c1d363..f4e435111 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -1026,7 +1026,8 @@ "emoji_list.creator": "Creator", "emoji_list.delete": "Delete", "emoji_list.empty": "No Custom Emoji Found", - "emoji_list.help": "Custom emoji are available to everyone on your server and will appear in the emoji autocomplete menu. Other users may need to refresh the page before new emojis appear.", + "emoji_list.help": "Custom emoji are available to everyone on your server. Type ':' in a message box to bring up the emoji selection menu. Other users may need to refresh the page before new emojis appear.", + "emoji_list.help2": "Tip: If you add #, ##, or ### as the first character on a new line containing emoji, you can use larger sized emoji. To try it out, send a message such as: '# :smile:'.", "emoji_list.image": "Image", "emoji_list.name": "Name", "emoji_list.search": "Search Custom Emoji", |