Commit 0de3fe11 authored by enahum's avatar enahum Committed by Corey Hulen
Browse files

Fix email verification process (#2664)

- Fix email verification URL in login view
- Fix URL in email being sent for verification
- Add Email Verification on password reset
- Fix display of email in reset password
- Fix URL en team_signup_password_page
- Fix typo in webapp en loc
- Add missing es locs
- Removed extra es, fr and pt locs
parent de5121a7
......@@ -90,7 +90,7 @@ export default class Login extends React.Component {
},
(err) => {
if (err.id === 'api.user.login.not_verified.app_error') {
browserHistory.push('/verify_email?teamname=' + encodeURIComponent(name) + '&email=' + encodeURIComponent(loginId));
browserHistory.push('/should_verify_email?teamname=' + encodeURIComponent(team) + '&email=' + encodeURIComponent(loginId));
return;
}
this.setState({serverEmailError: err.message});
......
......@@ -55,7 +55,9 @@ class PasswordResetSendLink extends React.Component {
<FormattedHTMLMessage
id='password_send.link'
defaultMessage='<p>A password reset link has been sent to <b>{email}</b></p>'
email={email}
values={{
email
}}
/>
<FormattedMessage
id={'password_send.checkInbox'}
......
......@@ -81,7 +81,7 @@ class TeamSignupPasswordPage extends React.Component {
},
(err) => {
if (err.id === 'api.user.login.not_verified.app_error') {
browserHistory.push('/verify_email?email=' + encodeURIComponent(teamSignup.team.email) + '&teamname=' + encodeURIComponent(teamSignup.team.name));
browserHistory.push('/should_verify_email?email=' + encodeURIComponent(teamSignup.team.email) + '&teamname=' + encodeURIComponent(teamSignup.team.name));
} else {
this.setState({serverError: err.message});
$('#finish-button').button('reset');
......
......@@ -111,12 +111,6 @@
"admin.compliance_table.timestamp": "Timestamp",
"admin.compliance_table.type": "Type",
"admin.compliance_table.userId": "Requested By",
"admin.email.allowEmailSignInDescription": "When true, Mattermost allows users to sign in using their email and password.",
"admin.email.allowEmailSignInTitle": "Allow Sign In With Email: ",
"admin.email.allowSignupDescription": "When true, Mattermost allows team creation and account signup using email and password. This value should be false only when you want to limit signup to a single-sign-on service like OAuth or LDAP.",
"admin.email.allowSignupTitle": "Allow Sign Up With Email: ",
"admin.email.allowUsernameSignInDescription": "When true, Mattermost allows users to sign in using their username and password. This setting is typically only used when email verification is disabled.",
"admin.email.allowUsernameSignInTitle": "Allow Sign In With Username: ",
"admin.connectionSecurityNone": "None",
"admin.connectionSecurityNoneDescription": "Mattermost will connect over an unsecure connection.",
"admin.connectionSecurityStart": "STARTTLS",
......@@ -125,6 +119,12 @@
"admin.connectionSecurityTitle": "Connection Security:",
"admin.connectionSecurityTls": "TLS",
"admin.connectionSecurityTlsDescription": "Encrypts the communication between Mattermost and your server.",
"admin.email.allowEmailSignInDescription": "When true, Mattermost allows users to sign in using their email and password.",
"admin.email.allowEmailSignInTitle": "Allow Sign In With Email: ",
"admin.email.allowSignupDescription": "When true, Mattermost allows team creation and account signup using email and password. This value should be false only when you want to limit signup to a single-sign-on service like OAuth or LDAP.",
"admin.email.allowSignupTitle": "Allow Sign Up With Email: ",
"admin.email.allowUsernameSignInDescription": "When true, Mattermost allows users to sign in using their username and password. This setting is typically only used when email verification is disabled.",
"admin.email.allowUsernameSignInTitle": "Allow Sign In With Username: ",
"admin.email.emailFail": "Connection unsuccessful: {error}",
"admin.email.emailSettings": "Email Settings",
"admin.email.emailSuccess": "No errors were reported while sending an email. Please check your inbox to make sure.",
......@@ -272,21 +272,21 @@
"admin.ldap.queryDesc": "The timeout value for queries to the LDAP server. Increase if you are getting timeout errors caused by a slow LDAP server.",
"admin.ldap.queryEx": "Ex \"60\"",
"admin.ldap.queryTitle": "Query Timeout (seconds):",
"admin.ldap.skipCertificateVerification": "Skip Vertificate Verification",
"admin.ldap.skipCertificateVerificationDesc": "Skips the certificate verificaiton step for TLS or STARTTLS connections. Not recommented for production enviroments where TLS is required. For testing only.",
"admin.ldap.save": "Save",
"admin.ldap.saving": "Saving Config...",
"admin.ldap.serverDesc": "The domain or IP address of LDAP server.",
"admin.ldap.serverEx": "Ex \"10.0.0.23\"",
"admin.ldap.serverTitle": "LDAP Server:",
"admin.ldap.skipCertificateVerification": "Skip Vertificate Verification",
"admin.ldap.skipCertificateVerificationDesc": "Skips the certificate verificaiton step for TLS or STARTTLS connections. Not recommented for production enviroments where TLS is required. For testing only.",
"admin.ldap.title": "LDAP Settings",
"admin.ldap.true": "true",
"admin.ldap.uernameAttrDesc": "The attribute in the LDAP server that will be used to populate the username field in Mattermost. This may be the same as the ID Attribute.",
"admin.ldap.userFilterDisc": "LDAP Filter to use when searching for user objects.",
"admin.ldap.userFilterEx": "Ex. \"(objectClass=user)\"",
"admin.ldap.userFilterTitle": "User Filter:",
"admin.ldap.usernameAttrEx": "Ex \"sAMAccountName\"",
"admin.ldap.usernameAttrTitle": "Username Attribute:",
"admin.ldap.userFilterTitle": "User Filter:",
"admin.ldap.userFilterEx": "Ex. \"(objectClass=user)\"",
"admin.ldap.userFilterDisc": "LDAP Filter to use when searching for user objects.",
"admin.licence.keyMigration": "If you’re migrating servers you may need to remove your license key from this server in order to install it on a new server. To start, <a href=\"http://mattermost.com\" target=\"_blank\">disable all Enterprise Edition features on this server</a>. This will enable the ability to remove the license key and downgrade this server from Enterprise Edition to Team Edition.",
"admin.license.choose": "Choose File",
"admin.license.chooseFile": "Choose File",
......
......@@ -118,20 +118,20 @@
"admin.compliance_table.timestamp": "Marca de tiempo",
"admin.compliance_table.type": "Tipo",
"admin.compliance_table.userId": "Solicitado por",
"admin.connectionSecurityNone": "Ninguna",
"admin.connectionSecurityNoneDescription": "Mattermost podrá utilizar una conexión insegura.",
"admin.connectionSecurityStart": "STARTTLS",
"admin.connectionSecurityStartDescription": "Intenta convertir una conexión insegura a una conexión segura utilizando TLS.",
"admin.connectionSecurityTest": "Probar Conexión",
"admin.connectionSecurityTitle": "Seguridad de Conexión:",
"admin.connectionSecurityTls": "TLS",
"admin.connectionSecurityTlsDescription": "Cifra la comnicación entre Mattermost y tu servidor.",
"admin.email.allowEmailSignInDescription": "Cuando es verdadero, Mattermost permite a los usuarios iniciar sesión utilizando el correo electrónico y contraseña.",
"admin.email.allowEmailSignInTitle": "Permitir inicio de sesión con Correo electrónico: ",
"admin.email.allowSignupDescription": "Cuando está en verdadero, Mattermost permite la creación de equipos y cuentas utilizando el correo electrónico y contraseña. Este valor debe estar en falso sólo cuando quieres limitar el inicio de sesión a través de servicios tipo OAuth o LDAP.",
"admin.email.allowSignupTitle": "Permitir registro con correo electrónico:",
"admin.email.allowUsernameSignInDescription": "Cuando es verdadero, Mattermost permite a los usuarios iniciar sesión con el nombre de usuario y contraseña. Esta opción normalmente se utiliza cuando la verificación de correo electrónico está deshabilitada.",
"admin.email.allowUsernameSignInTitle": "Permitir inicio de sesión con Nombre de usuario: ",
"admin.email.connectionSecurityNone": "Ninguno",
"admin.email.connectionSecurityNoneDescription": "Mattermost enviará los correos electrónicos sobre conexiones no seguras.",
"admin.email.connectionSecurityStart": "STARTTLS",
"admin.email.connectionSecurityStartDescription": "Tomar la conexión insegura e intentar actualizarla hacia una conexión segura utilizando TLS.",
"admin.email.connectionSecurityTest": "Prueba de conexión",
"admin.email.connectionSecurityTitle": "Seguridad de conexión:",
"admin.email.connectionSecurityTls": "TLS (Recomendado)",
"admin.email.connectionSecurityTlsDescription": "Cifra la comunicación entre Mattermost y tu servidor de correo electrónico.",
"admin.email.emailFail": "Conexión fallida: {error}",
"admin.email.emailSettings": "Configuraciones de correo",
"admin.email.emailSuccess": "No fueron reportados errores mientras se enviada el correo. Favor validar en tu bandeja de entrada.",
......@@ -284,9 +284,14 @@
"admin.ldap.serverDesc": "El dominio o dirección IP del servidor LDAP.",
"admin.ldap.serverEx": "Ej \"10.0.0.23\"",
"admin.ldap.serverTitle": "Servidor LDAP:",
"admin.ldap.skipCertificateVerification": "Omitir la Verificación del Certificado",
"admin.ldap.skipCertificateVerificationDesc": "Omite la verificación del certificado para las conexiones TLS o STARTTLS. No recomendado para ambientes de producción donde TLS es requerido. Utilizalo sólamente para pruebas.",
"admin.ldap.title": "Configuración de LDAP",
"admin.ldap.true": "verdadero",
"admin.ldap.uernameAttrDesc": "El atributo en el servidor LDAP que se utilizará para poblar el nombre de usuario en Mattermost. Este puede ser igual al Attributo Id.",
"admin.ldap.userFilterDisc": "Filtro de LDAP para buscar los objetos de los usuarios.",
"admin.ldap.userFilterEx": "Ej. \"(objectClass=user)\"",
"admin.ldap.userFilterTitle": "Filtro de Usuario:",
"admin.ldap.usernameAttrEx": "Ej \"sAMAccountName\"",
"admin.ldap.usernameAttrTitle": "Atributo Usuario:",
"admin.licence.keyMigration": "Si estás migrando servidores es posible que necesites remover tu licencia de este servidor para poder instalarlo en un servidor nuevo. Para empezar, <a href=\"http://mattermost.com\" target=\"_blank\">deshabilita todas las características de la Edición Enterprise de este servidor</a>. Esta operación habilitará la opción para remover la licencia y degradar este servidor de la Edición Enterprise a la Edición Team.",
......@@ -1420,4 +1425,4 @@
"web.footer.terms": "Términos",
"web.header.back": "Atrás",
"web.root.singup_info": "Todas las comunicaciones del equipo en un sólo lugar, con búsquedas y accesible desde cualquier parte"
}
\ No newline at end of file
}
......@@ -85,14 +85,6 @@
"admin.email.allowSignupTitle": "Autoriser la création de compte avec une adresse électronique :",
"admin.email.allowUsernameSignInDescription": "Si vrai, les utilisateurs seront autorisés à se connecter avec leur nom d'utilisateur et leur mot de passe. Cette option n'est généralement utilisée que lorsque la vérification de l'adresse électronique est désactivée.",
"admin.email.allowUsernameSignInTitle": "Autoriser la connexion avec le nom d'utilisateur:",
"admin.email.connectionSecurityNone": "Aucun",
"admin.email.connectionSecurityNoneDescription": "Mattermost enverra les courriels par une connexion non sécurisée.",
"admin.email.connectionSecurityStart": "STARTTLS",
"admin.email.connectionSecurityStartDescription": "Utiliser une connexion existante et non sécurisée et tenter de la faire évoluer vers une connexion sécurisée en utilisant TLS.",
"admin.email.connectionSecurityTest": "Tester une connexion",
"admin.email.connectionSecurityTitle": "Sécurité de la connexion :",
"admin.email.connectionSecurityTls": "TLS (recommandé)",
"admin.email.connectionSecurityTlsDescription": "Crypter la communication entre Mattermost et votre serveur mail.",
"admin.email.emailFail": "Echec de la connexion : {error}",
"admin.email.emailSettings": "Configuration de la messagerie",
"admin.email.emailSuccess": "Aucune erreur signalée lors de l'envoi du courriel. Vérifiez votre boîte de réception ou vos spams.",
......
......@@ -110,14 +110,6 @@
"admin.email.allowSignupTitle": "Permitir Inscrição com E-Mail: ",
"admin.email.allowUsernameSignInDescription": "Quando verdadeiro, Mattermost permite os usuários fazer login usando seu nome de usuário e senha. Esta configuração é normalmente utilizado apenas quando a verificação de e-mail está desativada.",
"admin.email.allowUsernameSignInTitle": "Permitir Login Com Usuário: ",
"admin.email.connectionSecurityNone": "Nenhum",
"admin.email.connectionSecurityNoneDescription": "Mattermost irá enviar usando uma conexão insegura.",
"admin.email.connectionSecurityStart": "STARTTLS",
"admin.email.connectionSecurityStartDescription": "Obtém uma conexão insegura existente e tenta atualizá-la para uma conexão segura usando TLS.",
"admin.email.connectionSecurityTest": "Testar Conexão",
"admin.email.connectionSecurityTitle": "Segurança da Conexão:",
"admin.email.connectionSecurityTls": "TLS (Recomendado)",
"admin.email.connectionSecurityTlsDescription": "Encriptar a comunicação entre Mattermost e o seu servidor de email.",
"admin.email.emailFail": "Conexão falhou: {error}",
"admin.email.emailSettings": "Configuração do e-mail",
"admin.email.emailSuccess": "Nenhum erro foram relatados durante o envio de um e-mail. Por favor verifique a sua caixa de entrada para se certificar.",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment