summaryrefslogtreecommitdiffstats
path: root/webapp/components/user_settings
diff options
context:
space:
mode:
authorJason Blais <jason@spinpunch.com>2017-04-03 21:27:45 -0400
committerJoram Wilander <jwawilander@gmail.com>2017-04-03 21:27:45 -0400
commitd5f56e678ac2aebd65e06ee3a079850013eb0ba2 (patch)
tree223f078ffd686df393680d755cd48eab7a895e81 /webapp/components/user_settings
parent169c490892041a7551b167e5f7ab4859ab003bae (diff)
downloadchat-d5f56e678ac2aebd65e06ee3a079850013eb0ba2.tar.gz
chat-d5f56e678ac2aebd65e06ee3a079850013eb0ba2.tar.bz2
chat-d5f56e678ac2aebd65e06ee3a079850013eb0ba2.zip
Update UI text for emoji picker setting (#5963)
* Update user_settings_advanced.jsx * Update en.json
Diffstat (limited to 'webapp/components/user_settings')
-rw-r--r--webapp/components/user_settings/user_settings_advanced.jsx2
1 files changed, 1 insertions, 1 deletions
diff --git a/webapp/components/user_settings/user_settings_advanced.jsx b/webapp/components/user_settings/user_settings_advanced.jsx
index cf05ab402..bd5597bbb 100644
--- a/webapp/components/user_settings/user_settings_advanced.jsx
+++ b/webapp/components/user_settings/user_settings_advanced.jsx
@@ -355,7 +355,7 @@ export default class AdvancedSettingsDisplay extends React.Component {
return (
<FormattedMessage
id='user.settings.advance.emojipicker'
- defaultMessage='Enable the emoji picker'
+ defaultMessage='Enable emoji picker for reactions and message input box'
/>
);
default: