summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2016-02-24 09:20:25 -0500
committerHarrison Healey <harrisonmhealey@gmail.com>2016-02-24 09:20:25 -0500
commitf7a4e9a5737f2d022b56617eff3d70cde64e8962 (patch)
tree7910bc188d7cd6f72b93ffdc11229110e9a371f4
parent01d9263981c76c7b582b77a22a8716794ac4a13a (diff)
parent85dfe2893d426c7e2f668b2dda35042e2200ede7 (diff)
downloadchat-f7a4e9a5737f2d022b56617eff3d70cde64e8962.tar.gz
chat-f7a4e9a5737f2d022b56617eff3d70cde64e8962.tar.bz2
chat-f7a4e9a5737f2d022b56617eff3d70cde64e8962.zip
Merge pull request #2240 from mattermost/plt-1707-fix
PLT-1707 Remove duplicate text
-rw-r--r--web/react/components/claim/email_to_sso.jsx2
-rw-r--r--web/static/i18n/en.json2
-rw-r--r--web/static/i18n/es.json2
3 files changed, 3 insertions, 3 deletions
diff --git a/web/react/components/claim/email_to_sso.jsx b/web/react/components/claim/email_to_sso.jsx
index 87e86697c..c3eea9495 100644
--- a/web/react/components/claim/email_to_sso.jsx
+++ b/web/react/components/claim/email_to_sso.jsx
@@ -84,7 +84,7 @@ class EmailToSSO extends React.Component {
<p>
<FormattedMessage
id='claim.email_to_sso.ssoType'
- defaultMessage='Upon claiming your account, you will only be able to login with {type} SSO. You must already have a valid {type} account'
+ defaultMessage='Upon claiming your account, you will only be able to login with {type} SSO'
values={{
type: Utils.toTitleCase(this.props.type)
}}
diff --git a/web/static/i18n/en.json b/web/static/i18n/en.json
index a4c32e6e4..0a4cbde6b 100644
--- a/web/static/i18n/en.json
+++ b/web/static/i18n/en.json
@@ -582,7 +582,7 @@
"claim.email_to_sso.pwd": "Password",
"claim.email_to_sso.pwdError": "Please enter your password.",
"claim.email_to_sso.ssoNote": "You must already have a valid {type} account",
- "claim.email_to_sso.ssoType": "Upon claiming your account, you will only be able to login with {type} SSO. You must already have a valid {type} account",
+ "claim.email_to_sso.ssoType": "Upon claiming your account, you will only be able to login with {type} SSO",
"claim.email_to_sso.switchTo": "Switch account to {uiType}",
"claim.email_to_sso.title": "Switch Email/Password Account to {uiType}",
"claim.sso_to_email.confirm": "Confirm Password",
diff --git a/web/static/i18n/es.json b/web/static/i18n/es.json
index f0fec290a..3991a5b84 100644
--- a/web/static/i18n/es.json
+++ b/web/static/i18n/es.json
@@ -582,7 +582,7 @@
"claim.email_to_sso.pwd": "Contraseña",
"claim.email_to_sso.pwdError": "Por favor introduce tu contraseña.",
"claim.email_to_sso.ssoNote": "Debes tener una cuenta válida con {type}",
- "claim.email_to_sso.ssoType": "Al reclamar tu cuenta, sólo podrás iniciar sesión con {type}. Debes tener una cuenta válida con {type}",
+ "claim.email_to_sso.ssoType": "Al reclamar tu cuenta, sólo podrás iniciar sesión con {type}",
"claim.email_to_sso.switchTo": "Cambiar cuenta a {uiType}",
"claim.email_to_sso.title": "Cambiar Cuenta de Correo/Contraseña a {uiType}",
"claim.sso_to_email.confirm": "Confirmar Contraseña",