From c34df4a2976eb220d1042bd4dfdeebaaf9c7f1b6 Mon Sep 17 00:00:00 2001 From: =Corey Hulen Date: Tue, 9 Feb 2016 11:43:25 -0800 Subject: Fixing slash command help --- .../user_settings/manage_command_hooks.jsx | 266 +++++++++++---------- .../user_settings/user_settings_integrations.jsx | 4 +- web/static/i18n/en.json | 47 ++-- web/static/i18n/es.json | 22 -- 4 files changed, 167 insertions(+), 172 deletions(-) diff --git a/web/react/components/user_settings/manage_command_hooks.jsx b/web/react/components/user_settings/manage_command_hooks.jsx index 3656424b2..f4009aeaa 100644 --- a/web/react/components/user_settings/manage_command_hooks.jsx +++ b/web/react/components/user_settings/manage_command_hooks.jsx @@ -18,7 +18,7 @@ const holders = defineMessages({ }, addDisplayNamePlaceholder: { id: 'user.settings.cmds.add_display_name.placeholder', - defaultMessage: 'Display Name' + defaultMessage: 'Example: "Search patient records"' }, addUsernamePlaceholder: { id: 'user.settings.cmds.add_username.placeholder', @@ -30,11 +30,11 @@ const holders = defineMessages({ }, addAutoCompleteDescPlaceholder: { id: 'user.settings.cmds.auto_complete_desc.placeholder', - defaultMessage: 'A short description of what this commands does.' + defaultMessage: 'Example: "Returns search results for patient records"' }, addAutoCompleteHintPlaceholder: { id: 'user.settings.cmds.auto_complete_hint.placeholder', - defaultMessage: '[zipcode]' + defaultMessage: 'Example: [Patient Name]' }, adUrlPlaceholder: { id: 'user.settings.cmds.url.placeholder', @@ -261,7 +261,7 @@ export default class ManageCommandCmds extends React.Component { {cmd.trigger} @@ -273,19 +273,41 @@ export default class ManageCommandCmds extends React.Component { key={cmd.id} className='webhook__item webcmd__item' > + {triggerDiv} +
+ + + {cmd.url} +
- {cmd.display_name} + + + { + cmd.method === 'P' ? + : + + } +
{cmd.username}
@@ -293,7 +315,7 @@ export default class ManageCommandCmds extends React.Component { {cmd.icon_url} @@ -301,56 +323,34 @@ export default class ManageCommandCmds extends React.Component { {cmd.auto_complete ? this.props.intl.formatMessage(holders.autocompleteYes) : this.props.intl.formatMessage(holders.autocompleteNo)} -
- - - {cmd.auto_complete_desc} -
{cmd.auto_complete_hint}
- - - { - cmd.method === 'P' ? - : - - } - + {cmd.auto_complete_desc}
-
+
- {cmd.url} + {cmd.display_name}
- {triggerDiv}
+
+
- +
+
+
+
+ +
+ +
+ +
+
+
- {''}
+
+
@@ -539,34 +575,18 @@ export default class ManageCommandCmds extends React.Component { />
-
- -
- -
-
+
@@ -581,64 +601,60 @@ export default class ManageCommandCmds extends React.Component {
+
- + value={this.state.cmd.auto_complete_desc} + onChange={this.updateAutoCompleteDesc} + placeholder={this.props.intl.formatMessage(holders.addAutoCompleteDescPlaceholder)} + />
+
- +
{addError}
+
http://mattermost.org/commands to learn more.", + "user.settings.cmds.add_desc": "Create slash commands to send events to external integrations and receive a response. For example typing `/patient Joe Smith` could bring back search results from your internal health records management system for the name 'Joe Smith'. Please see Slash commands documentation for detailed instructions.", "user.settings.cmds.add_new": "Add a new command", - "user.settings.cmds.cmd_display_name": "Command display name.", - "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_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.", - "user.settings.cmds.url_desc": "URL that will receive the HTTP POST or GET event", + "user.settings.cmds.cmd_display_name": "Brief description of slash command to show in listings.", + "user.settings.cmds.username_desc": "Choose a username override for responses for this slash command. Usernames can consist of up to 22 characters consisting of lowercase letters, numbers and they symbols \"-\", \"_\", and \".\" .", + "user.settings.cmds.icon_url_desc": "Choose a profile picture override for the post responses to this slash command. Enter the URL of a .png or .jpg file at least 128 pixels by 128 pixels.", + "user.settings.cmds.trigger_desc": "Examples: /patient, /client, /employee Reserved: /echo, /join, /logout, /me, /shrug", + "user.settings.cmds.auto_complete_help": " Show this command in the autocomplete list.", + "user.settings.cmds.auto_complete_hint_desc": "Optional hint in the autocomplete list about parameters needed for command.", + "user.settings.cmds.request_type_desc": "The type of command request issued to the Request URL.", + "user.settings.cmds.url_desc": "The callback URL to receive the HTTP POST or GET event request when the slash command is run.", "user.settings.cmds.add": "Add", "user.settings.hooks_in.channel": "Channel: ", "user.settings.hooks_in.none": "None", @@ -1182,8 +1183,8 @@ "user.settings.integrations.incomingWebhooksDescription": "Manage your incoming webhooks", "user.settings.integrations.outWebhooks": "Outgoing Webhooks", "user.settings.integrations.outWebhooksDescription": "Manage your outgoing webhooks", - "user.settings.integrations.commands": "Commands", - "user.settings.integrations.commandsDescription": "Manage your commands", + "user.settings.integrations.commands": "Slash Commands", + "user.settings.integrations.commandsDescription": "Manage your slash commands", "user.settings.integrations.title": "Integration Settings", "user.settings.modal.general": "General", "user.settings.modal.security": "Security", diff --git a/web/static/i18n/es.json b/web/static/i18n/es.json index 8b9ab09bf..778ecc60a 100644 --- a/web/static/i18n/es.json +++ b/web/static/i18n/es.json @@ -1059,39 +1059,19 @@ "user.settings.advance.sendTitle": "Enviar mensajes con Ctrl + Retorno", "user.settings.advance.title": "Configuración Avanzada", "user.settings.cmds.add": "Agregar", - "user.settings.cmds.add_desc": "Crea comandos que permitan enviar eventos a integraciones externas. Por favor revisa http://mattermost.org/commands para aprender más.", - "user.settings.cmds.add_display_name.placeholder": "Nombre a mostrar", "user.settings.cmds.add_new": "Agregar un nuevo comando", "user.settings.cmds.add_trigger.placeholder": "Gatillador del Comando ej. \"hola\" no se debe incluir la barra", "user.settings.cmds.add_username.placeholder": "Nombre de usuario", - "user.settings.cmds.auto_complete": "Auto completado: ", "user.settings.cmds.auto_complete.no": "no", "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_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]", - "user.settings.cmds.auto_complete_hint_desc": "Lista de parámetros que recibe el comando.", - "user.settings.cmds.cmd_display_name": "Nombre a mostrar del Comando.", - "user.settings.cmds.display_name": "Nombre a mostrar: ", "user.settings.cmds.existing": "Comandos existentes", - "user.settings.cmds.icon_url": "URL del icono: ", - "user.settings.cmds.icon_url_desc": "URL para un icono", "user.settings.cmds.none": "Ninguno", "user.settings.cmds.regen": "Regenerar Token", - "user.settings.cmds.request_type": "Tipo de Solicitud: ", - "user.settings.cmds.request_type_desc": "Tipo de solicitud emitido al callback URL por el Comando.", "user.settings.cmds.request_type_get": "GET", "user.settings.cmds.request_type_post": "POST", "user.settings.cmds.token": "Token: ", - "user.settings.cmds.trigger": "Gatillador: ", - "user.settings.cmds.trigger_desc": "Palabra que gatilla la acción", - "user.settings.cmds.url": "URL: ", "user.settings.cmds.url.placeholder": "Debe comenzar con http:// o https://", - "user.settings.cmds.url_desc": "URL que va a recibir el evento HTTP POST o GET", - "user.settings.cmds.username": "Nombre de usuario: ", - "user.settings.cmds.username_desc": "El nombre de usuario a utilizar cuando se genere el mensaje.", "user.settings.custom_theme.awayIndicator": "Indicador Ausente", "user.settings.custom_theme.buttonBg": "Fondo Botón", "user.settings.custom_theme.buttonColor": "Texto Botón", @@ -1194,8 +1174,6 @@ "user.settings.import_theme.importHeader": "Importar Tema de Slack", "user.settings.import_theme.submit": "Enviar", "user.settings.import_theme.submitError": "Formato inválido, por favor intenta copiando y pegando nuevamente.", - "user.settings.integrations.commands": "Comandos", - "user.settings.integrations.commandsDescription": "Administra tus comandos", "user.settings.integrations.incomingWebhooks": "Webhooks de entrada", "user.settings.integrations.incomingWebhooksDescription": "Administra tus webhooks de entrada", "user.settings.integrations.outWebhooks": "Webhooks de salida", -- cgit v1.2.3-1-g7c22