From 48763a00b9d1dee74c788d149bed3c669fa9afbf Mon Sep 17 00:00:00 2001
From: Eric Sethna <eric@spinpunch.com>
Date: Fri, 1 Sep 2017 11:03:38 -0600
Subject: [PATCH] [PLT-7043] Update LDAP > Email help text (#7313)

* update help text

* Update ldap_to_email.jsx

* Update LDAP > email text
---
 .../components/claim/components/ldap_to_email.jsx | 15 ++++-----------
 webapp/i18n/en.json                               |  7 +++----
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/webapp/components/claim/components/ldap_to_email.jsx b/webapp/components/claim/components/ldap_to_email.jsx
index ad7b0658b8..e68fbb48b6 100644
--- a/webapp/components/claim/components/ldap_to_email.jsx
+++ b/webapp/components/claim/components/ldap_to_email.jsx
@@ -147,16 +147,10 @@ export default class LDAPToEmail extends React.Component {
                     onSubmit={this.preSubmit}
                     className={formClass}
                 >
-                    <p>
-                        <FormattedMessage
-                            id='claim.ldap_to_email.ssoType'
-                            defaultMessage='Upon claiming your account, you will only be able to login with your email and password'
-                        />
-                    </p>
                     <p>
                         <FormattedMessage
                             id='claim.ldap_to_email.email'
-                            defaultMessage='You will use the email {email} to login'
+                            defaultMessage='After switching your authentication method, you will use {email} to login. Your AD/LDAP credentials will no longer allow access to Mattermost.'
                             values={{
                                 email: this.props.email
                             }}
@@ -165,10 +159,9 @@ export default class LDAPToEmail extends React.Component {
                     <p>
                         <FormattedMessage
                             id='claim.ldap_to_email.enterLdapPwd'
-                            defaultMessage='Enter your {ldapPassword} for your {site} email account'
+                            defaultMessage='{ldapPassword}:'
                             values={{
-                                ldapPassword: passwordPlaceholder,
-                                site: global.window.mm_config.SiteName
+                                ldapPassword: passwordPlaceholder
                             }}
                         />
                     </p>
@@ -186,7 +179,7 @@ export default class LDAPToEmail extends React.Component {
                     <p>
                         <FormattedMessage
                             id='claim.ldap_to_email.enterPwd'
-                            defaultMessage='Enter a new password for your email account'
+                            defaultMessage='New email login password:'
                         />
                     </p>
                     <div className={passwordClass}>
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index eb86f647ec..9f6a3a8505 100755
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -1312,15 +1312,14 @@
   "claim.email_to_oauth.switchTo": "Switch account to {uiType}",
   "claim.email_to_oauth.title": "Switch Email/Password Account to {uiType}",
   "claim.ldap_to_email.confirm": "Confirm Password",
-  "claim.ldap_to_email.email": "You will use the email {email} to login",
-  "claim.ldap_to_email.enterLdapPwd": "Enter your {ldapPassword} for your {site} email account",
-  "claim.ldap_to_email.enterPwd": "Enter a new password for your email account",
+  "claim.ldap_to_email.email": "After switching your authentication method, you will use {email} to login. Your AD/LDAP credentials will no longer allow access to Mattermost.",
+  "claim.ldap_to_email.enterLdapPwd": "{ldapPassword}:",
+  "claim.ldap_to_email.enterPwd": "New email login password:",
   "claim.ldap_to_email.ldapPasswordError": "Please enter your AD/LDAP password.",
   "claim.ldap_to_email.ldapPwd": "AD/LDAP Password",
   "claim.ldap_to_email.pwd": "Password",
   "claim.ldap_to_email.pwdError": "Please enter your password.",
   "claim.ldap_to_email.pwdNotMatch": "Passwords do not match.",
-  "claim.ldap_to_email.ssoType": "Upon claiming your account, you will only be able to login with your email and password",
   "claim.ldap_to_email.switchTo": "Switch account to email/password",
   "claim.ldap_to_email.title": "Switch AD/LDAP Account to Email/Password",
   "claim.oauth_to_email.confirm": "Confirm Password",