diff options
| author | Christopher Speller <crspeller@gmail.com> | 2016-02-08 07:31:33 -0500 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2016-02-08 07:31:33 -0500 |
| commit | 9b35fb5fa59099fe644a1b1ef3734b09b50f98bf (patch) | |
| tree | 2d8a1a3060addd6de1ebd5598feeb2d1267630c9 /web | |
| parent | daa363574a3cb01fecdf8cdbfabd0a9739bf13c9 (diff) | |
| parent | 2b32bad9937a429edc89067c54fb055de2b1316b (diff) | |
| download | chat-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')
| -rw-r--r-- | web/react/components/user_settings/manage_command_hooks.jsx | 16 | ||||
| -rw-r--r-- | web/static/i18n/en.json | 1 | ||||
| -rw-r--r-- | web/static/i18n/es.json | 1 |
3 files changed, 2 insertions, 16 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'> diff --git a/web/static/i18n/en.json b/web/static/i18n/en.json index caa4afae3..0bb238a90 100644 --- a/web/static/i18n/en.json +++ b/web/static/i18n/en.json @@ -1087,7 +1087,6 @@ "user.settings.cmds.username_desc": "The username to use when overriding the post.", "user.settings.cmds.icon_url_desc": "URL to an icon", "user.settings.cmds.trigger_desc": "Word to trigger on", - "user.settings.cmds.auto_complete_desc_desc": "A short description of what this commands does", "user.settings.cmds.auto_complete_help": "Show this command in autocomplete list.", "user.settings.cmds.auto_complete_hint_desc": "List parameters to be passed to the command.", "user.settings.cmds.request_type_desc": "Command request type issued to the callback URL.", diff --git a/web/static/i18n/es.json b/web/static/i18n/es.json index b22a7cfd2..faac529b4 100644 --- a/web/static/i18n/es.json +++ b/web/static/i18n/es.json @@ -1074,7 +1074,6 @@ "user.settings.cmds.auto_complete.yes": "sí", "user.settings.cmds.auto_complete_desc": "Descripción del Auto Completado: ", "user.settings.cmds.auto_complete_desc.placeholder": "Una pequeña descripción de que hace el comando.", - "user.settings.cmds.auto_complete_desc_desc": "Una pequeña descripción de que hace el comando", "user.settings.cmds.auto_complete_help": "Mostrar este comando en la lista de auto completado.", "user.settings.cmds.auto_complete_hint": "Pista de auto completado: ", "user.settings.cmds.auto_complete_hint.placeholder": "[código postal]", |