From 7b0b0be977abe30d4fac1524d22fe40c0205d895 Mon Sep 17 00:00:00 2001
From: George Goldberg <george@gberg.me>
Date: Mon, 5 Dec 2016 14:15:17 +0000
Subject: PLT-4862 Slack Import links should open in new tab (#4683)

* Update Slack Import help text.

It was quite inaccurate in light of all the recently added features.

* Update wording as per review.

* Don't use FormattedHTMLMessage

* Fix linter complaints.
---
 webapp/components/team_import_tab.jsx | 66 ++++++++++++++++++++++++++++++++---
 webapp/i18n/en.json                   |  7 +++-
 2 files changed, 67 insertions(+), 6 deletions(-)

(limited to 'webapp')

diff --git a/webapp/components/team_import_tab.jsx b/webapp/components/team_import_tab.jsx
index ab92903db..364190a52 100644
--- a/webapp/components/team_import_tab.jsx
+++ b/webapp/components/team_import_tab.jsx
@@ -4,7 +4,7 @@
 import * as utils from 'utils/utils.jsx';
 import SettingUpload from './setting_upload.jsx';
 
-import {intlShape, injectIntl, defineMessages, FormattedMessage, FormattedHTMLMessage} from 'react-intl';
+import {intlShape, injectIntl, defineMessages, FormattedMessage} from 'react-intl';
 
 const holders = defineMessages({
     importSlack: {
@@ -44,12 +44,68 @@ class TeamImportTab extends React.Component {
 
     render() {
         const {formatMessage} = this.props.intl;
+        var uploadDocsLink = (
+            <a
+                href='https://docs.mattermost.com/administration/migrating.html#migrating-from-slack'
+                target='_blank'
+                rel='noopener noreferrer'
+            >
+                <FormattedMessage
+                    id='team_import_tab.importHelpDocsLink'
+                    defaultMessage='documentation'
+                />
+            </a>
+        );
+
+        var uploadExportInstructions = (
+            <strong>
+                <FormattedMessage
+                    id='team_import_tab.importHelpExportInstructions'
+                    defaultMessage='Slack > Team Settings > Import/Export Data > Export > Start Export'
+                />
+            </strong>
+        );
+
+        var uploadExporterLink = (
+            <a
+                href='https://github.com/grundleborg/slack-advanced-exporter'
+                target='_blank'
+                rel='noopener noreferrer'
+            >
+                <FormattedMessage
+                    id='team_import_tab.importHelpExporterLink'
+                    defaultMessage='Slack Advanced Exporter'
+                />
+            </a>
+        );
+
         var uploadHelpText = (
             <div>
-                <FormattedHTMLMessage
-                    id='team_import_tab.importHelp'
-                    defaultMessage="<p>Slack import to Mattermost supports importing of messages in your Slack team's public channels.</p><p>To import a team from Slack, go to <strong>Slack > Team Settings > Import/Export Data > Export > Start Export</strong>.  See <a href='https://docs.mattermost.com/administration/migrating.html#migrating-from-slack'>documentation</a> to learn more.</p><p>To import posts with attached files, see <a href='https://github.com/grundleborg/slack-advanced-exporter'>Slack Advanced Exporter</a> for details.</p>"
-                />
+                <p>
+                    <FormattedMessage
+                        id='team_import_tab.importHelpLine1'
+                        defaultMessage="Slack import to Mattermost supports importing of messages in your Slack team's public channels."
+                    />
+                </p>
+                <p>
+                    <FormattedMessage
+                        id='team_import_tab.importHelpLine2'
+                        defaultMessage='To import a team from Slack, go to {exportInstructions}. See {uploadDocsLink} to learn more.'
+                        values={{
+                            exportInstructions: uploadExportInstructions,
+                            uploadDocsLink
+                        }}
+                    />
+                </p>
+                <p>
+                    <FormattedMessage
+                        id='team_import_tab.importHelpLine3'
+                        defaultMessage='To import posts with attached files, see {slackAdvancedExporterLink} for details.'
+                        values={{
+                            slackAdvancedExporterLink: uploadExporterLink
+                        }}
+                    />
+                </p>
             </div>
         );
 
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index 8a8d3713e..ed519a8b2 100644
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -1790,7 +1790,12 @@
   "team_export_tab.unable": " Unable to export: {error}",
   "team_import_tab.failure": " Import failure: ",
   "team_import_tab.import": "Import",
-  "team_import_tab.importHelp": "<p>Slack import to Mattermost supports importing of messages in your Slack team's public channels.</p><p>To import a team from Slack, go to <strong>Slack > Team Settings > Import/Export Data > Export > Start Export</strong>.  See <a href=\"https://docs.mattermost.com/administration/migrating.html#migrating-from-slack\">documentation</a> to learn more.</p><p>To import posts with attached files, see <a href=\"https://github.com/grundleborg/slack-advanced-exporter\">Slack Advanced Exporter</a> for details.</p>",
+  "team_import_tab.importHelpDocsLink": "documentation",
+  "team_import_tab.importHelpExporterLink": "Slack Advanced Exporter",
+  "team_import_tab.importHelpExportInstructions": "Slack > Team Settings > Import/Export Data > Export > Start Export",
+  "team_import_tab.importHelpLine1": "Slack import to Mattermost supports importing of messages in your Slack team's public channels.",
+  "team_import_tab.importHelpLine2": "To import a team from Slack, go to {exportInstructions}. See {uploadDocsLink} to learn more.",
+  "team_import_tab.importHelpLine3": "To import posts with attached files, see {slackAdvancedExporterLink} for details.",
   "team_import_tab.importSlack": "Import from Slack (Beta)",
   "team_import_tab.importing": " Importing...",
   "team_import_tab.successful": " Import successful: ",
-- 
cgit v1.2.3-1-g7c22