IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Update UI text for emoji picker setting (#5963)

Browse Source 
* Update user_settings_advanced.jsx

* Update en.json
This commit is contained in:
Jason Blais
2017-04-03 21:27:45 -04:00
committed by Joram Wilander
parent 169c490892
commit d5f56e678a
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
webapp/components/user_settings/user_settings_advanced.jsx
View File

@@ -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:

2
webapp/i18n/en.json
View File

@@ -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",