diff options
| author | Jason Blais <jason@spinpunch.com> | 2017-04-03 21:27:45 -0400 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2017-04-03 21:27:45 -0400 |
| commit | d5f56e678ac2aebd65e06ee3a079850013eb0ba2 (patch) | |
| tree | 223f078ffd686df393680d755cd48eab7a895e81 | |
| parent | 169c490892041a7551b167e5f7ab4859ab003bae (diff) | |
| download | chat-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
| -rw-r--r-- | webapp/components/user_settings/user_settings_advanced.jsx | 2 | ||||
| -rwxr-xr-x | webapp/i18n/en.json | 2 |
2 files changed, 2 insertions, 2 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: diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index 036bcd2d3..13660e12a 100755 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -2052,7 +2052,7 @@ "upload_overlay.info": "Drop a file to upload it.", "user.settings.advance.embed_preview": "For the first web link in a message, display a preview of website content below the message, if available", "user.settings.advance.embed_toggle": "Show toggle for all embed previews", - "user.settings.advance.emojipicker": "Enable emoji picker in message input box", + "user.settings.advance.emojipicker": "Enable emoji picker for reactions and message input box", "user.settings.advance.enabledFeatures": "{count, number} {count, plural, one {Feature} other {Features}} Enabled", "user.settings.advance.formattingDesc": "If enabled, posts will be formatted to create links, show emoji, style the text, and add line breaks. By default, this setting is enabled. Changing this setting requires the page to be refreshed.", "user.settings.advance.formattingTitle": "Enable Post Formatting", |