diff options
| -rw-r--r-- | i18n/en.json | 8 | ||||
| -rw-r--r-- | i18n/es.json | 8 | ||||
| -rw-r--r-- | webapp/components/user_settings/user_settings_security.jsx | 42 | ||||
| -rw-r--r-- | webapp/i18n/en.json | 6 | ||||
| -rw-r--r-- | webapp/i18n/es.json | 3 |
5 files changed, 42 insertions, 25 deletions
diff --git a/i18n/en.json b/i18n/en.json index 9b9f57fca..0c32d8dc3 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -1016,6 +1016,10 @@ "translation": "Only a team admin can export data." }, { + "id": "api.team.get_invite_info.not_open_team", + "translation": "Invite is invalid because this is not an open team." + }, + { "id": "api.team.import_team.admin.app_error", "translation": "Only a team admin can import data." }, @@ -3594,9 +3598,5 @@ { "id": "web.watcher_fail.error", "translation": "Failed to add directory to watcher %v" - }, - { - "id": "api.team.get_invite_info.not_open_team", - "translation": "Invite is invalid because this is not an open team." } ] diff --git a/i18n/es.json b/i18n/es.json index b86c1d868..4622a1b12 100644 --- a/i18n/es.json +++ b/i18n/es.json @@ -1016,6 +1016,10 @@ "translation": "Sólo un administrador del equipo puede exportar data." }, { + "id": "api.team.get_invite_info.not_open_team", + "translation": "La invitación es inválida debido a que este no es un equipo abierto." + }, + { "id": "api.team.import_team.admin.app_error", "translation": "Sólo un administrador del equipo puede importar data." }, @@ -1624,6 +1628,10 @@ "translation": "No se pudo subir la imagen del perfil" }, { + "id": "api.user.verify_email.bad_link.app_error", + "translation": "Enlace de verificación de correo electrónico errado." + }, + { "id": "api.web_conn.new_web_conn.last_activity.error", "translation": "Falla al actualizar LastActivityAt para user_id=%v and session_id=%v, err=%v" }, diff --git a/webapp/components/user_settings/user_settings_security.jsx b/webapp/components/user_settings/user_settings_security.jsx index 8688c7f2f..e42de91ea 100644 --- a/webapp/components/user_settings/user_settings_security.jsx +++ b/webapp/components/user_settings/user_settings_security.jsx @@ -221,24 +221,30 @@ class SecurityTab extends React.Component { var d = new Date(this.props.user.last_password_update); const hours12 = !Utils.isMilitaryTime(); - describe = formatMessage(holders.lastUpdated, { - date: ( - <FormattedDate - value={d} - day='2-digit' - month='short' - year='numeric' - /> - ), - time: ( - <FormattedTime - value={d} - hour12={hours12} - hour='2-digit' - minute='2-digit' - /> - ) - }); + describe = ( + <FormattedMessage + id='user.settings.security.lastUpdated' + defaultMessage='Last updated {date} at {time}' + values={{ + date: ( + <FormattedDate + value={d} + day='2-digit' + month='short' + year='numeric' + /> + ), + time: ( + <FormattedTime + value={d} + hour12={hours12} + hour='2-digit' + minute='2-digit' + /> + ) + }} + /> + ); updateSectionStatus = function updateSection() { this.props.updateSection('password'); diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index 2a536925c..bb1f05c23 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -660,13 +660,13 @@ "email_signup.emailError": "Please enter a valid email address", "email_signup.find": "Find my teams", "email_verify.almost": "{siteName}: You are almost done", + "email_verify.failed": " Failed to send verification email.", "email_verify.notVerifiedBody": "Please verify your email address. Check your inbox for an email.", - "email_verify.verifyFailed": "Failed to verify your email.", "email_verify.resend": "Resend Email", "email_verify.sent": " Verification email sent.", - "email_verify.failed": " Failed to send verification email.", "email_verify.verified": "{siteName} Email Verified", "email_verify.verifiedBody": "<p>Your email has been verified! Click <a href={url}>here</a> to log in.</p>", + "email_verify.verifyFailed": "Failed to verify your email.", "error_bar.preview_mode": "Preview Mode: Email notifications have not been configured", "file_attachment.download": "Download", "file_info_preview.size": "Size ", @@ -758,9 +758,9 @@ "login.noAccount": "Don't have an account? ", "login.on": "on {siteName}", "login.or": "or", + "login.session_expired": " Your session has expired. Please login again.", "login.signTo": "Sign in to:", "login.verified": " Email Verified", - "login.session_expired": " Your session has expired. Please login again.", "login_email.badTeam": "Bad team name", "login_email.email": "Email", "login_email.emailReq": "An email is required", diff --git a/webapp/i18n/es.json b/webapp/i18n/es.json index f42dc879a..0f927101d 100644 --- a/webapp/i18n/es.json +++ b/webapp/i18n/es.json @@ -660,11 +660,13 @@ "email_signup.emailError": "Por favor ingresa una dirección de correos válida", "email_signup.find": "Encontrar mi equipo", "email_verify.almost": "{siteName}: Ya casi estás listo", + "email_verify.failed": " Falla al enviar el correo de verificación.", "email_verify.notVerifiedBody": "Por favor verifica tu correo electrónico. Revisa tu bandeja de entrada, hemos enviado un correo de verificación.", "email_verify.resend": "Reenviar Correo", "email_verify.sent": " Correo de verificación enviado.", "email_verify.verified": "{siteName} Correo electrónico verificado", "email_verify.verifiedBody": "<p>Tu correo electrónico ha sido verificado!! Pincha <a href={url}>aquí</a> para iniciar sesión.</p>", + "email_verify.verifyFailed": "Falla al verificar tu correo electrónico.", "error_bar.preview_mode": "Modo de prueba: Las notificaciones por correo electrónico no han sido configuradas", "file_attachment.download": "Descargar", "file_info_preview.size": "Tamaño ", @@ -756,6 +758,7 @@ "login.noAccount": "¿No tienes una cuenta? ", "login.on": "en {siteName}", "login.or": "o", + "login.session_expired": " Tu sesión ha expirado. Por favor inicia sesión nuevamente.", "login.signTo": "Ingresar a:", "login.verified": " Correo electrónico Verificado", "login_email.badTeam": "Nombre de Equipo inválido", |