From d7b055f4284dea3b776fe20af436a9da3a48c6b8 Mon Sep 17 00:00:00 2001
From: Jason Blais <jason@spinpunch.com>
Date: Mon, 21 Aug 2017 08:04:33 -0400
Subject: Minor string changes for JIRA setting (#7264)

* Update settings.jsx

* Update en.json
---
 webapp/i18n/en.json                         | 6 +++---
 webapp/plugins/jira/components/settings.jsx | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index 606b5dd5f..b7ecc1b63 100755
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -651,15 +651,15 @@
   "admin.password.symbol": "At least one symbol (e.g. \"~!@#$%^&*()\")",
   "admin.password.uppercase": "At least one uppercase letter",
   "admin.plugins.jira": "JIRA (Beta)",
-  "admin.plugins.jira.channelParamNamePlaceholder": "channelname",
+  "admin.plugins.jira.channelParamNamePlaceholder": "channelurl",
   "admin.plugins.jira.enabledDescription": "When true, you can configure JIRA webhooks to post message in Mattermost. To help combat phishing attacks, all posts are labelled by a BOT tag.",
-  "admin.plugins.jira.enabledLabel": "Enabled:",
+  "admin.plugins.jira.enabledLabel": "Enable JIRA:",
   "admin.plugins.jira.secretDescription": "This secret is used to authenticate to Mattermost.",
   "admin.plugins.jira.secretLabel": "Secret:",
   "admin.plugins.jira.secretParamPlaceholder": "secret",
   "admin.plugins.jira.secretRegenerateDescription": "Regenerates the secret for the webhook URL endpoint. Regenerating the secret invalidates your existing JIRA integrations.",
   "admin.plugins.jira.setupDescription": "Use this webhook URL to set up the JIRA integration. See {webhookDocsLink} to learn more.",
-  "admin.plugins.jira.teamParamPlaceholder": "teamname",
+  "admin.plugins.jira.teamParamPlaceholder": "teamurl",
   "admin.plugins.jira.userDescription": "Select the username that this integration is attached to.",
   "admin.plugins.jira.userLabel": "User:",
   "admin.plugins.jira.webhookDocsLink": "documentation",
diff --git a/webapp/plugins/jira/components/settings.jsx b/webapp/plugins/jira/components/settings.jsx
index 87a44794b..4e9a479f5 100644
--- a/webapp/plugins/jira/components/settings.jsx
+++ b/webapp/plugins/jira/components/settings.jsx
@@ -180,7 +180,7 @@ export default class JIRASettings extends AdminSettings {
             <SettingsGroup>
                 <BooleanSetting
                     id='enabled'
-                    label={Utils.localizeMessage('admin.plugins.jira.enabledLabel', 'Enabled:')}
+                    label={Utils.localizeMessage('admin.plugins.jira.enabledLabel', 'Enable JIRA:')}
                     helpText={Utils.localizeMessage('admin.plugins.jira.enabledDescription', 'When true, you can configure JIRA webhooks to post message in Mattermost. To help combat phishing attacks, all posts are labelled by a BOT tag.')}
                     value={this.state.enabled}
                     onChange={(id, value) => this.handleEnabledChange(value)}
@@ -237,9 +237,9 @@ export default class JIRASettings extends AdminSettings {
                                         '/plugins/jira/webhook?secret=' +
                                         (this.state.secret ? encodeURIComponent(this.state.secret) : ('<b>' + Utils.localizeMessage('admin.plugins.jira.secretParamPlaceholder', 'secret') + '</b>')) +
                                         '&team=<b>' +
-                                        Utils.localizeMessage('admin.plugins.jira.teamParamPlaceholder', 'teamname') +
+                                        Utils.localizeMessage('admin.plugins.jira.teamParamPlaceholder', 'teamurl') +
                                         '</b>&channel=<b>' +
-                                        Utils.localizeMessage('admin.plugins.jira.channelParamNamePlaceholder', 'channelname') +
+                                        Utils.localizeMessage('admin.plugins.jira.channelParamNamePlaceholder', 'channelurl') +
                                         '</b>'
                                 }}
                             />
-- 
cgit v1.2.3-1-g7c22