-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #466 from ValentinTrinque/fix-locales
Fix locales `errors.messages.already_in_use` + clean up
- Loading branch information
Showing
11 changed files
with
123 additions
and
123 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,47 +1,47 @@ | ||
| en: | ||
| devise_token_auth: | ||
| sessions: | ||
| not_confirmed: "A confirmation email was sent to your account at %{email}. You must follow the instructions in the email before your account can be activated" | ||
| not_confirmed: "A confirmation email was sent to your account at '%{email}'. You must follow the instructions in the email before your account can be activated" | ||
| bad_credentials: "Invalid login credentials. Please try again." | ||
| not_supported: "Use POST /sign_in to sign in. GET is not supported." | ||
| user_not_found: "User was not found or was not logged in." | ||
| token_validations: | ||
| invalid: "Invalid login credentials" | ||
| registrations: | ||
| missing_confirm_success_url: "Missing `confirm_success_url` param." | ||
| redirect_url_not_allowed: "Redirect to %{redirect_url} not allowed." | ||
| email_already_exists: "An account already exists for %{email}" | ||
| account_with_uid_destroyed: "Account with uid %{uid} has been destroyed." | ||
| missing_confirm_success_url: "Missing 'confirm_success_url' parameter." | ||
| redirect_url_not_allowed: "Redirect to '%{redirect_url}' not allowed." | ||
| email_already_exists: "An account already exists for '%{email}'" | ||
| account_with_uid_destroyed: "Account with UID '%{uid}' has been destroyed." | ||
| account_to_destroy_not_found: "Unable to locate account for destruction." | ||
| user_not_found: "User not found." | ||
| passwords: | ||
| missing_email: "You must provide an email address." | ||
| missing_redirect_url: "Missing redirect url." | ||
| not_allowed_redirect_url: "Redirect to %{redirect_url} not allowed." | ||
| sended: "An email has been sent to %{email} containing instructions for resetting your password." | ||
| missing_redirect_url: "Missing redirect URL." | ||
| not_allowed_redirect_url: "Redirect to '%{redirect_url}' not allowed." | ||
| sended: "An email has been sent to '%{email}' containing instructions for resetting your password." | ||
| user_not_found: "Unable to find user with email '%{email}'." | ||
| password_not_required: "This account does not require a password. Sign in using your %{provider} account instead." | ||
| missing_passwords: 'You must fill out the fields labeled "password" and "password confirmation".' | ||
| password_not_required: "This account does not require a password. Sign in using your '%{provider}' account instead." | ||
| missing_passwords: "You must fill out the fields labeled 'Password' and 'Password confirmation'." | ||
| successfully_updated: "Your password has been successfully updated." | ||
| errors: | ||
| validate_sign_up_params: "Please submit proper sign up data in request body." | ||
| validate_account_update_params: "Please submit proper account update data in request body." | ||
| not_email: "is not an email" | ||
| messages: | ||
| already_in_use: already in use | ||
| already_in_use: "already in use" | ||
| validate_sign_up_params: "Please submit proper sign up data in request body." | ||
| validate_account_update_params: "Please submit proper account update data in request body." | ||
| not_email: "is not an email" | ||
| devise: | ||
| mailer: | ||
| confirmation_instructions: | ||
| confirm_link_msg: "You can confirm your account email through the link below:" | ||
| confirm_account_link: Confirm my account | ||
| confirm_account_link: "Confirm my account" | ||
| reset_password_instructions: | ||
| request_reset_link_msg: "Someone has requested a link to change your password. You can do this through the link below." | ||
| password_change_link: Change my password | ||
| password_change_link: "Change my password" | ||
| ignore_mail_msg: "If you didn't request this, please ignore this email." | ||
| no_changes_msg: "Your password won't change until you access the link above and create a new one." | ||
| unlock_instructions: | ||
| account_lock_msg: Your account has been locked due to an excessive number of unsuccessful sign in attempts. | ||
| account_lock_msg: "Your account has been locked due to an excessive number of unsuccessful sign in attempts." | ||
| unlock_link_msg: "Click the link below to unlock your account:" | ||
| unlock_link: Unlock my account | ||
| hello: hello | ||
| welcome: welcome | ||
| unlock_link: "Unlock my account" | ||
| hello: "hello" | ||
| welcome: "welcome" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,50 +1,50 @@ | ||
| es: | ||
| devise_token_auth: | ||
| sessions: | ||
| not_confirmed: "Un correo electrónico de confirmación de su cuenta ha sido enviado a %{email}. Por favor, siga las instrucciones para validar su cuenta" | ||
| not_confirmed: "Un correo electrónico de confirmación de su cuenta ha sido enviado a '%{email}'. Por favor, siga las instrucciones para validar su cuenta" | ||
| bad_credentials: "Identidad o contraseña no válida." | ||
| not_supported: "Use POST /sign_in para la conexión. GET no esta disponible." | ||
| user_not_found: "Usuario desconocido o no está conectado." | ||
| token_validations: | ||
| invalid: "Identidad o contraseña no válida." | ||
| registrations: | ||
| missing_confirm_success_url: "El parámetro `confirm_success_url` no esta presente." | ||
| redirect_url_not_allowed: "Redirección hacia %{redirect_url} no esta permitida." | ||
| email_already_exists: "Una cuenta ya existe con este correo electrónico: %{email}" | ||
| account_with_uid_destroyed: "La cuenta con el identificador %{uid} se ha eliminado." | ||
| missing_confirm_success_url: "El parámetro 'confirm_success_url' no esta presente." | ||
| redirect_url_not_allowed: "Redirección hacia '%{redirect_url}' no esta permitida." | ||
| email_already_exists: "Una cuenta ya existe con este correo electrónico '%{email}'" | ||
| account_with_uid_destroyed: "La cuenta con el identificador '%{uid}' se ha eliminado." | ||
| account_to_destroy_not_found: "No se puede encontrar la cuenta a borrar." | ||
| user_not_found: "Usuario no encontrado." | ||
| passwords: | ||
| missing_email: "Debe incluir un correo electrónico." | ||
| missing_redirect_url: "Falta el Url de redirección." | ||
| not_allowed_redirect_url: "Redirección hacia %{redirect_url} no esta permitida." | ||
| sended: "Un correo electrónico ha sido enviado a %{email} con las instrucciones para restablecer su contraseña." | ||
| user_not_found: "No se pudo encontrar un usuario con este correo electrónico: '%{email}'." | ||
| password_not_required: "Esta cuenta no requiere contraseña. Iniciar sesión utilizando %{provider}." | ||
| missing_passwords: 'Debe llenar los campos "contraseña" y "confirmación de contraseña".' | ||
| not_allowed_redirect_url: "Redirección hacia '%{redirect_url}' no esta permitida." | ||
| sended: "Un correo electrónico ha sido enviado a '%{email}' con las instrucciones para restablecer su contraseña." | ||
| user_not_found: "No se pudo encontrar un usuario con este correo electrónico '%{email}'." | ||
| password_not_required: "Esta cuenta no requiere contraseña. Iniciar sesión utilizando '%{provider}'." | ||
| missing_passwords: "Debe llenar los campos 'Contraseña' y 'Confirmación de contraseña'." | ||
| successfully_updated: "Su contraseña ha sido actualizada con éxito." | ||
| errors: | ||
| validate_sign_up_params: "Los datos introducidos en la solicitud de acceso no son válidos." | ||
| validate_account_update_params: "Los datos introducidos en la solicitud de actualización no son válidos." | ||
| not_email: "no es un correo electrónico" | ||
| messages: | ||
| already_in_use: ya ha sido ocupado | ||
| validate_sign_up_params: "Los datos introducidos en la solicitud de acceso no son válidos." | ||
| validate_account_update_params: "Los datos introducidos en la solicitud de actualización no son válidos." | ||
| not_email: "no es un correo electrónico" | ||
| already_in_use: "ya ha sido ocupado" | ||
| devise: | ||
| mailer: | ||
| confirmation_instructions: | ||
| subject: Instrucciones de confirmación | ||
| subject: "Instrucciones de confirmación" | ||
| confirm_link_msg: "Para confirmar su cuenta ingrese en el siguiente link:" | ||
| confirm_account_link: Confirmar cuenta | ||
| confirm_account_link: "Confirmar cuenta" | ||
| reset_password_instructions: | ||
| subject: Instrucciones para restablecer su contraseña | ||
| subject: "Instrucciones para restablecer su contraseña" | ||
| request_reset_link_msg: "Ha solicitado un cambio de contraseña. Para continuar ingrese en el siguiente link:" | ||
| password_change_link: Cambiar contraseña | ||
| ignore_mail_msg: Por favor ignore este mensaje si no ha solicitado esta acción. | ||
| password_change_link: "Cambiar contraseña" | ||
| ignore_mail_msg: "Por favor ignore este mensaje si no ha solicitado esta acción." | ||
| no_changes_msg: "Importante: Su contraseña no será actualizada a menos que ingrese en el link." | ||
| unlock_instructions: | ||
| subject: Instrucciones de desbloqueo | ||
| account_lock_msg: Su cuenta ha sido bloqueada debido a sucesivos intentos de ingresos fallidos | ||
| subject: "Instrucciones de desbloqueo" | ||
| account_lock_msg: "Su cuenta ha sido bloqueada debido a sucesivos intentos de ingresos fallidos" | ||
| unlock_link_msg: "Para desbloquear su cuenta ingrese en el siguiente link:" | ||
| unlock_link: Desbloquear cuenta | ||
| hello: hola | ||
| welcome: bienvenido | ||
| unlock_link: "Desbloquear cuenta" | ||
| hello: "hola" | ||
| welcome: "bienvenido" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.