diff options
author | lfbrock <lfbrock@users.noreply.github.com> | 2016-07-07 09:58:15 -0400 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2016-07-07 09:58:15 -0400 |
commit | 21dc536c4722ec82d3223c52a2685afe3dd25f68 (patch) | |
tree | df722a39cf1dd297e9bb0fd09883ca463314337d /webapp | |
parent | f2b140168093a11ad90742eaf2121f6b15eacb0a (diff) | |
download | chat-21dc536c4722ec82d3223c52a2685afe3dd25f68.tar.gz chat-21dc536c4722ec82d3223c52a2685afe3dd25f68.tar.bz2 chat-21dc536c4722ec82d3223c52a2685afe3dd25f68.zip |
Update emoji-list.jsx (#3520)
* Update emoji-list.jsx
* Update en.json
* Update emoji_list.jsx
* Update en.json
* Update emoji_list.jsx
* Update en.json
Diffstat (limited to 'webapp')
-rw-r--r-- | webapp/components/emoji/components/emoji_list.jsx | 2 | ||||
-rw-r--r-- | webapp/i18n/en.json | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/webapp/components/emoji/components/emoji_list.jsx b/webapp/components/emoji/components/emoji_list.jsx index b80615935..257cc567f 100644 --- a/webapp/components/emoji/components/emoji_list.jsx +++ b/webapp/components/emoji/components/emoji_list.jsx @@ -143,7 +143,7 @@ export default class EmojiList extends React.Component { <span className='backstage-list__help'> <FormattedMessage id='emoji_list.help' - defaultMessage='Custom emoji are available to everyone on your server and will show up in the emoji autocomplete menu.' + 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.' /> </span> <div className='backstage-list'> diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index b7d531beb..7330d441b 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -1020,6 +1020,7 @@ "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.image": "Image", "emoji_list.name": "Name", "emoji_list.search": "Search Custom Emoji", |