Skip to content

Commit

Permalink
Update UI text for emoji picker setting (#5963)
Browse files Browse the repository at this point in the history
* Update user_settings_advanced.jsx

* Update en.json
  • Loading branch information
jasonblais authored and jwilander committed Apr 4, 2017
1 parent 169c490 commit d5f56e6
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion webapp/components/user_settings/user_settings_advanced.jsx
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion webapp/i18n/en.json
Expand Up @@ -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",
Expand Down

0 comments on commit d5f56e6

Please sign in to comment.