summaryrefslogtreecommitdiffstats
path: root/web/react
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2016-02-08 07:31:33 -0500
committerChristopher Speller <crspeller@gmail.com>2016-02-08 07:31:33 -0500
commit9b35fb5fa59099fe644a1b1ef3734b09b50f98bf (patch)
tree2d8a1a3060addd6de1ebd5598feeb2d1267630c9 /web/react
parentdaa363574a3cb01fecdf8cdbfabd0a9739bf13c9 (diff)
parent2b32bad9937a429edc89067c54fb055de2b1316b (diff)
downloadchat-9b35fb5fa59099fe644a1b1ef3734b09b50f98bf.tar.gz
chat-9b35fb5fa59099fe644a1b1ef3734b09b50f98bf.tar.bz2
chat-9b35fb5fa59099fe644a1b1ef3734b09b50f98bf.zip
Merge pull request #2092 from mattermost/fix-slash
Fixing slash commands
Diffstat (limited to 'web/react')
-rw-r--r--web/react/components/user_settings/manage_command_hooks.jsx16
1 files changed, 2 insertions, 14 deletions
diff --git a/web/react/components/user_settings/manage_command_hooks.jsx b/web/react/components/user_settings/manage_command_hooks.jsx
index b2fc0a4e1..948ab7885 100644
--- a/web/react/components/user_settings/manage_command_hooks.jsx
+++ b/web/react/components/user_settings/manage_command_hooks.jsx
@@ -537,17 +537,11 @@ export default class ManageCommandCmds extends React.Component {
onChange={this.updateAutoComplete}
/>
<FormattedMessage
- id='user.settings.cmds.auto_complete_desc_desc'
- defaultMessage='A short description of what this commands does'
+ id='user.settings.cmds.auto_complete_help'
+ defaultMessage='Show this command in autocomplete list'
/>
</label>
</div>
- <div className='padding-top'>
- <FormattedMessage
- id='user.settings.cmds.auto_complete_help'
- defaultMessage='Show this command in autocomplete list.'
- />
- </div>
</div>
<div className='padding-top x2'>
<label className='control-label'>
@@ -565,12 +559,6 @@ export default class ManageCommandCmds extends React.Component {
placeholder={this.props.intl.formatMessage(holders.addAutoCompleteDescPlaceholder)}
/>
</div>
- <div className='padding-top'>
- <FormattedMessage
- id='user.settings.cmds.auto_complete_desc_desc'
- defaultMessage='A short description of what this commands does'
- />
- </div>
</div>
<div className='padding-top x2'>
<label className='control-label'>