diff --git a/app/views/spree/user_mailer/confirmation_instructions.html.erb b/app/views/spree/user_mailer/confirmation_instructions.html.erb index 0bf431706..957528543 100644 --- a/app/views/spree/user_mailer/confirmation_instructions.html.erb +++ b/app/views/spree/user_mailer/confirmation_instructions.html.erb @@ -1,5 +1,5 @@

- <%= Spree.t('user_mailer.confirmation_instructions.welcome', email: @email) %> + <%= I18n.t('devise.mailer.confirmation_instructions.greeting', recipient: @email) %>

<%= Spree.t('user_mailer.confirmation_instructions.instructions_1', { store_name: @current_store.name }) %> diff --git a/app/views/spree/user_mailer/confirmation_instructions.text.erb b/app/views/spree/user_mailer/confirmation_instructions.text.erb index 6b05a961e..cb6d025ef 100644 --- a/app/views/spree/user_mailer/confirmation_instructions.text.erb +++ b/app/views/spree/user_mailer/confirmation_instructions.text.erb @@ -1,4 +1,4 @@ -<%= Spree.t('user_mailer.confirmation_instructions.welcome', email: @email) %> +<%= I18n.t('devise.mailer.confirmation_instructions.greeting', recipient: @email) %> <%= Spree.t('user_mailer.confirmation_instructions.instructions_1', { store_name: @current_store.name }) %> <%= Spree.t('user_mailer.confirmation_instructions.instructions_2') %> <%= Spree.t('user_mailer.confirmation_instructions.button') %> diff --git a/app/views/spree/user_mailer/reset_password_instructions.html.erb b/app/views/spree/user_mailer/reset_password_instructions.html.erb index aad032fec..4f2eb6d07 100644 --- a/app/views/spree/user_mailer/reset_password_instructions.html.erb +++ b/app/views/spree/user_mailer/reset_password_instructions.html.erb @@ -1,5 +1,5 @@

- <%= Spree.t('user_mailer.reset_password_instructions.welcome', email: @user.email) %> + <%= I18n.t('devise.mailer.reset_password_instructions.greeting', recipient: @user.email) %>

<%= Spree.t('user_mailer.reset_password_instructions.instructions_1', { store_name: @current_store.name }) %> diff --git a/app/views/spree/user_passwords/edit.html.erb b/app/views/spree/user_passwords/edit.html.erb index b8f3e5964..dc690b638 100755 --- a/app/views/spree/user_passwords/edit.html.erb +++ b/app/views/spree/user_passwords/edit.html.erb @@ -4,7 +4,7 @@

-

<%= Spree.t(:change_your_password) %>

+

<%= I18n.t('devise.passwords.edit.change_your_password') %>

<%= form_for @spree_user, as: :spree_user, url: spree.update_password_path, method: :put do |f| %>
diff --git a/config/locales/bg.yml b/config/locales/bg.yml index 28acca537..d11687890 100644 --- a/config/locales/bg.yml +++ b/config/locales/bg.yml @@ -1,54 +1,20 @@ bg: spree: admin_login: "Админ вход" - change_your_password: "Промени своята парола" devise: confirmations: confirmed: Вашият акаунт е потвърден. Вече сте вписан. - send_instructions: До няколко минути ще получите съобщение с обяснение как да потвърдите своя акаунт. failure: - inactive: Вашият акаунт все още не е активен. invalid: Грешен имейл или парола. invalid_token: Невалиден token. - locked: Вашият акаунт е заключен. - timeout: 'Вашата сесия е изтекла, моля влезте отново.' - unauthenticated: За да продължите трябва да влезете в профила си. - unconfirmed: Трябва да потвърдите акаунта си преди да продължите. - mailer: - confirmation_instructions: - subject: Инструкции за потвърждаване - reset_password_instructions: - subject: Инструкции за смяна на паролата - unlock_instructions: - subject: Инструкции за отключване - oauth_callbacks: - failure: "Не можете да бъдете оторизиран от %{kind}, поради %{reason}." - success: "Влязохте успешно с вашият %{kind} профил." unlocks: - send_instructions: До няколко минути ще получите имейл с инструкции как да отключите своя акаунт. unlocked: Вашият акаунт бе отключен успешно. Вече сте вписани. user_passwords: spree_user: cannot_be_blank: Вашата парола не може бъде празна. - no_token: Не можете да достъпите тази страница ако не влезете през мейла за забравена парола. - send_instructions: До няколко минути ще получите имейл с инструкции как да промените паролата си. - updated: Вашата парола бе променена успешко. Вече сте вписани. - user_registrations: - destroyed: Вашият акаунт бе отменен успешно. Надяваме се да Ви видим скоро. - inactive_signed_up: 'Вие се регистрирахте успешно, въпреки това не можете да се логнете в системата, поради %{reason}.' - signed_up: Вие се регистрирахте успешно. - updated: Успешно обновихте своя акаунт. user_sessions: - signed_in: Успешно влизане - signed_out: Успешно излизане already_signed_in: Вече сте влезли already_signed_out: Вече сте излезли errors: messages: - already_confirmed: Вече бе потвърден email_is_invalid: Email не може да бъде празен - not_found: Не е намерен - not_locked: Не е заключен - not_saved: - one: '1 грешка предотврати запазването на %{resource}:' - other: '%{count} грешки предотвратиха запазването на %{resource}:' diff --git a/config/locales/de.yml b/config/locales/de.yml index 3a2934bbe..4e0689342 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -2,7 +2,6 @@ de: spree: admin_login: Admin Login - change_your_password: Kennwort zurücksetzen user_mailer: reset_password_instructions: instructions_1: "Es wurde eine Anfrage zum Zurücksetzen Ihres Passworts gestellt.\nWenn Sie diese Anfrage nicht gestellt haben, ignorieren Sie diese E-Mail.\n\nWenn Sie diese Anfrage gestellt haben, klicken Sie bitte auf den folgenden Link:" @@ -13,53 +12,19 @@ de: devise: confirmations: confirmed: Ihr Konto wurde erfolgreich aktiviert. - send_instructions: 'In ein paar Minuten erhalten Sie eine E-Mail mit Anweisungen, um Ihr Konto zu aktivieren.' spree_user: already_confirmed: Ihre E-Mail wurde bereits bestätigt. Bitte versuchen Sie erneut, sich anzumelden. failure: - inactive: Ihr Konto wurde noch nicht aktiviert. invalid: Ungültige E-Mail-Adresse oder Passwort. invalid_token: Ungültiger Authentifizierungsschlüssel. - locked: Ihr Konto ist gesperrt. - timeout: 'Ihre Sitzung ist abgelaufen. Bitte melden Sie sich erneut an, um fortzufahren.' - unauthenticated: 'Sie müssen sich anmelden oder registrieren, bevor Sie fortfahren.' - unconfirmed: 'Sie müssen Ihre Registrierung bestätigen, bevor Sie fortfahren.' - mailer: - confirmation_instructions: - subject: Bestätigen Sie Ihre Registrierung - reset_password_instructions: - subject: Passwort zurücksetzen - unlock_instructions: - subject: Konto freischalten - oauth_callbacks: - failure: 'Autorisierung durch %{kind} fehlgeschlagen aufgrund von %{reason}.' - success: 'Erfolgreich autorisiert durch %{kind} Konto.' unlocks: - send_instructions: In ein paar Minuten erhalten Sie eine E-Mail mit Anweisungen um Ihr Konto freizuschalten. unlocked: Ihr Konto wurde erfolgreich freigeschaltet. user_passwords: spree_user: cannot_be_blank: Ihr Passwort darf nicht leer sein. - no_token: Sie können nicht auf diese Seite zugreifen, wenn Sie den Link aus einer E-Mail zum Zurücksetzen des Kennworts nicht verwenden. Wenn Sie den Link aus einer E-Mail zum Zurücksetzen des Passworts verwenden, stellen Sie bitte sicher, dass Sie die vollständige URL verwendet haben. - send_instructions: In ein paar Minuten erhalten Sie eine E-Mail mit Anweisungen um Ihr Passwort zurücksetzen. - updated: Ihr Passwort wurde erfolgreich geändert. - user_registrations: - destroyed: Ihr Konto wurde erfolgreich gelöscht. Auf Wiedersehen! - inactive_signed_up: 'Sie haben sich erfolgreich registriert. Wir konnten Sie jedoch nicht anmelden, da Ihr Konto %{reason} ist.' - signed_up_but_unconfirmed: Eine Nachricht mit einem Bestätigungslink wurde an Ihre E-Mail-Adresse gesendet. Bitte folgen Sie dem Link, um Ihr Konto zu aktivieren. - signed_up: Herzlich Willkommen! Sie haben sich erfolgreich registriert. - updated: Sie haben Ihr Konto erfolgreich aktualisiert. user_sessions: - signed_in: Erfolgreich angemeldet. - signed_out: Erfolgreich abgemeldet. already_signed_in: Bereits angemeldet. already_signed_out: Bereits abgemeldet. errors: messages: - already_confirmed: wurde bereits bestätigt email_is_invalid: E-Mail-Adresse darf nicht leer sein - not_found: nicht gefunden - not_locked: war nicht gesperrt - not_saved: - one: '1 Fehler verhindert das Speichern von %{resource}:' - other: '%{count} Fehler verhindern das Speichern von %{resource}:' diff --git a/config/locales/en.yml b/config/locales/en.yml index 2b45e9e02..79931e273 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -2,10 +2,8 @@ en: spree: admin_login: "Admin Login" - change_your_password: "Change your password" user_mailer: reset_password_instructions: - welcome: "Hi %{email}" instructions_1: "A request to reset the password for your %{store_name} account has been made." instructions_2: Click the button below to reset it. instructions_3: If you did not request a password change ignore this email or contact us. @@ -13,7 +11,6 @@ en: thanks: Thank you, store_team: "%{store_name} Team" confirmation_instructions: - welcome: "Welcome %{email}!" instructions_1: "Thanks for registering at %{store_name}." instructions_2: "Click the button below to confirm your account:" instructions_3: If you have any questions, feel free to simply reply to this email. @@ -23,53 +20,19 @@ en: devise: confirmations: confirmed: Your account was successfully confirmed. You can now log in. - send_instructions: You will receive an email with instructions about how to confirm your account in a few minutes. spree_user: already_confirmed: Email was already confirmed, please try signing in. failure: - inactive: Your account was not activated yet. invalid: Invalid email or password. invalid_token: Invalid authentication token. - locked: Your account is locked. - timeout: 'Your session expired, please sign in again to continue.' - unauthenticated: You need to sign in or sign up before continuing. - unconfirmed: You have to confirm your account before continuing. - mailer: - confirmation_instructions: - subject: Confirmation instructions - reset_password_instructions: - subject: Reset password instructions - unlock_instructions: - subject: Unlock Instructions - oauth_callbacks: - failure: 'Could not authorize you from %{kind} because %{reason}.' - success: 'Successfully authorized from %{kind} account.' unlocks: - send_instructions: You will receive an email with instructions about how to unlock your account in a few minutes. unlocked: Your account was successfully unlocked. You are now signed in. user_passwords: spree_user: cannot_be_blank: Your password cannot be blank. - no_token: "You can't access this page without coming from a password reset email. If you do come from a password reset email, please make sure you used the full URL provided." - send_instructions: You will receive an email with instructions about how to reset your password in a few minutes. - updated: Your password was changed successfully. You are now signed in. - user_registrations: - destroyed: Bye! Your account was successfully cancelled. We hope to see you again soon. - inactive_signed_up: 'You have signed up successfully. However, we could not sign you in because your account is %{reason}.' - signed_up_but_unconfirmed: "A message with a confirmation link has been sent to your email address. Please follow the link to activate your account." - signed_up: Welcome! You have signed up successfully. - updated: You updated your account successfully. user_sessions: - signed_in: Signed in successfully. - signed_out: Signed out successfully. already_signed_in: Already signed in. already_signed_out: Already signed out. errors: messages: - already_confirmed: was already confirmed email_is_invalid: Email address cannot be blank - not_found: not found - not_locked: was not locked - not_saved: - one: '1 error prohibited this %{resource} from being saved:' - other: '%{count} errors prohibited this %{resource} from being saved:' diff --git a/config/locales/es.yml b/config/locales/es.yml index af488f77d..dafe186ac 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -3,47 +3,14 @@ es: devise: confirmations: confirmed: Su cuenta ha sido confirmada. Ahora está conectado. - send_instructions: Recibirá un email con instrucciones acerca de como confirmar su cuenta en pocos minutos. failure: - inactive: Su cuenta no ha sido activada aún. invalid: Dirección de correo o contraseña no válidos. invalid_token: Token de autenticación no válido. - locked: Su cuenta está bloqueada. - timeout: 'Su sesión ha expirado, por favor conéctese de nuevo para continuar.' - unauthenticated: Necesita conectarse o registrarse para continuar. - unconfirmed: Necesita confirmar su cuenta para continuar. - mailer: - confirmation_instructions: - subject: Instrucciones de confirmación - reset_password_instructions: - subject: Instrucciones para restablecer la contraseña - unlock_instructions: - subject: Instrucciones de desbloqueo - oauth_callbacks: - failure: 'No es posible autorizarle desde %{kind} porque %{reason}.' - success: 'Cuenta autorizada correctamente desde %{kind}.' unlocks: - send_instructions: Recibirá un email con instrucciones acerca de cómo desbloquear su cuenta en pocos minutos. unlocked: Su cuenta ha sido desbloqueada correctamente. Ahora está conectado. user_passwords: spree_user: cannot_be_blank: La contraseña no puede estar en blanco. - send_instructions: Recibirá un email con instrucciones acerca de como restaurar su contraseña en pocos minutos. - updated: Su contraseña ha sido cambiada correctamente. Ahora está conectado. - user_registrations: - destroyed: Hasta luego! Su cuenta ha sido cancelada correctamente. Esperamos volver a verle pronto. - inactive_signed_up: 'Ha sido registrado correctamente. Sin embargo, no se puede acceder porque su cuenta está %{reason}.' - signed_up: Bienvenido! Ha sido registrado correctamente. - updated: Su cuenta ha sido actualizada correctamente . - user_sessions: - signed_in: Conectado correctamente. - signed_out: Desconectado correctamente. errors: messages: - already_confirmed: ya estaba confirmado email_is_invalid: dirección de correo electrónico no puede estar en blanco - not_found: no encontrado - not_locked: no estaba bloqueado - not_saved: - one: '1 error impidió guardar este %{resource}:' - other: '%{count} errores impidieron guardar este %{resource}:' diff --git a/config/locales/fr.yml b/config/locales/fr.yml index f3939de4d..2646c5127 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -3,47 +3,14 @@ fr: devise: confirmations: confirmed: Votre compte a été confirmé. Vous êtes maintenant connecté(e). - send_instructions: Vous recevrez dans quelques minutes un courriel avec les instructions sur la façon de confirmer votre compte. failure: - inactive: Votre compte n'a pas encore été activé. invalid: Courriel ou mot de passe non valide. invalid_token: Jeton d'authentification non valide. - locked: Votre compte est bloqué. - timeout: 'Votre session a expiré, merci de bien vouloir vous connecter à nouveau pour continuer.' - unauthenticated: Vous devez vous identifier ou vous inscrire avant de poursuivre. - unconfirmed: Vous devez confirmer votre compte avant de continuer. - mailer: - confirmation_instructions: - subject: Instructions de confirmation d'inscription - reset_password_instructions: - subject: Instructions pour réinitialiser votre mot de passe - unlock_instructions: - subject: Instructions pour déverrouiller votre compte - oauth_callbacks: - failure: 'Connexion impossible pour le compte %{kind} car %{reason}.' - success: 'Connexion avec succès pour le compte %{kind}.' unlocks: - send_instructions: Vous recevrez dans quelques minutes un courriel avec les instructions sur la façon de déverrouiller votre compte. unlocked: Votre compte a été déverrouillé. Vous êtes maintenant connecté(e). user_passwords: spree_user: cannot_be_blank: Votre mot de passe ne peut pas être vide. - send_instructions: Vous recevrez dans quelques minutes un courriel avec les instructions sur la façon de réinitialiser votre mot de passe. - updated: Votre mot de passe a été changé avec succès. Vous êtes maintenant connecté(e). - user_registrations: - destroyed: Au revoir! Votre compte a été annulé. Nous espérons vous revoir bientôt. - inactive_signed_up: "Vous vous êtes inscrit(e) avec succès. Cependant, nous n'avons pu vous connecter car votre compte est %{reason}." - signed_up: Bienvenue! Vous vous êtes inscrit(e) avec succès. - updated: Vous avez mis à jour votre compte avec succès. - user_sessions: - signed_in: Connexion avec succès. - signed_out: Déconnexion avec succès. errors: messages: - already_confirmed: a déjà été confirmé email_is_invalid: adresse e-mail ne peut pas être vide - not_found: "n'a pas été trouvé" - not_locked: "n'a pas été bloqué" - not_saved: - one: "1 erreur interdit cette %{ressource} d'être enregistrée :" - other: "%{count} erreurs interdisent cette %{resource} d'être enregistrée :" diff --git a/config/locales/it.yml b/config/locales/it.yml index 71e2f9564..5e7aa9293 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -6,71 +6,14 @@ it: devise: confirmations: confirmed: Il tuo account è stato correttamente confermato. Ora sei collegato. - send_instructions: Riceverai un messaggio email con le istruzioni per confermare il tuo account entro qualche minuto. - send_paranoid_instructions: Se la tua e-mail esiste nel nostro database, riceverai un messaggio email con le istruzioni per confermare il tuo account entro qualche minuto. failure: - already_authenticated: Hai già effettuato l'accesso. - inactive: Il tuo account non è stato ancora attivato. invalid: Indirizzo email o password non validi. invalid_token: Token di autenticazione non valido. - last_attempt: Hai ancora un tentativo prima che l'account venga bloccato. - locked: Il tuo account è bloccato. - not_found_in_database: Email o password non validi. - timeout: Sessione scaduta, accedere nuovamente per continuare. - unauthenticated: Devi accedere o registrarti per continuare. - unconfirmed: Devi confermare il tuo account per continuare. - mailer: - confirmation_instructions: - subject: Istruzioni per la conferma - reset_password_instructions: - subject: Istruzioni per reimpostare la password - unlock_instructions: - subject: Istruzioni per sbloccare l'account - omniauth_callbacks: - failure: Non è stato possibile autorizzarti da %{kind} perché "%{reason}". - success: Autorizzato con successo dall'account %{kind}. - user_passwords: - no_token: Puoi accedere a questa pagina solamente dalla email di reset della password. Se vieni dalla email controlla di aver inserito l'url completo riportato nella email. - send_instructions: Riceverai un messaggio email con le istruzioni per reimpostare la tua password entro qualche minuto. - send_paranoid_instructions: Se la tua e-mail esiste nel nostro database, riceverai un messaggio email contentente un link per il ripristino della password - updated: La tua password è stata cambiata. Ora sei collegato. - updated_not_active: La tua password è stata cambiata. - registrations: - destroyed: Arrivederci! L'account è stato cancellato. Speriamo di rivederci presto. - signed_up: Iscrizione eseguita correttamente. Se abilitata, una conferma è stata inviata al tuo indirizzo email. - signed_up_but_inactive: Iscrizione eseguita correttamente. Però non puoi accedere in quanto il tuo account non è ancora attivo. - signed_up_but_locked: Iscrizione eseguita correttamente. Però non puoi accedere in quanto il tuo account è bloccato. - signed_up_but_unconfirmed: Ti è stato inviato un messaggio con un link di conferma. Ti invitiamo a visitare il link per attivare il tuo account. - update_needs_confirmation: Il tuo account è stato aggiornato, ma dobbiamo verificare la tua email. Ti invitiamo a consultare la tua email e cliccare sul link di conferma. - updated: Il tuo account è stato aggiornato. - sessions: - signed_in: Accesso effettuato con successo. - signed_out: Sei uscito correttamente. unlocks: - send_instructions: Riceverai un messaggio email con le istruzioni per sbloccare il tuo account entro qualche minuto. - send_paranoid_instructions: Se la tua e-mail esiste nel nostro database, riceverai un messaggio email con le istruzioni per sbloccare il tuo account entro qualche minuto. unlocked: Il tuo account è stato correttamente sbloccato. Ora sei collegato. user_passwords: spree_user: cannot_be_blank: La tua password non può essere vuota. - send_instructions: Riceverai un'email con le istruzioni per resettare la tua password entro qualche minuto. - updated: La tua password è stata cambiata con successo. Ora sei collegato. - user_registrations: - destroyed: Addio! Il tuo account è stato correttamente cancellato. Speriamo di rivederti presto. - inactive_signed_up: Ti sei collegato con successo. Tuttavia non possiamo collegarti perché il tuo account è %{reason}. - signed_up: Benvenuto! Ti sei collegato con successo. - updated: Hai aggiornato correttamente il tuo account. - user_sessions: - signed_in: Collegato con successo. - signed_out: Uscito correttamente. errors: messages: email_is_invalid: L'indirizzo email non può essere vuoto - already_confirmed: è stato già confermato - confirmation_period_expired: deve essere confermato entro %{period}, richiedi una nuova conferma - expired: è scaduto, si prega di richiederne uno nuovo - not_found: non trovato - not_locked: non era bloccato - not_saved: - one: ! 'Non posso salvare questo %{resource}: 1 errore' - other: ! 'Non posso salvare questo %{resource}: %{count} errori.' diff --git a/config/locales/nl.yml b/config/locales/nl.yml index 0dbeddad6..78a4b62ad 100755 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -3,47 +3,14 @@ nl: devise: confirmations: confirmed: Je account is succesvol bevestigd. Je bent nu ingelogd. - send_instructions: Binnen enkele minuten ontvang je een e-mail om je account te bevestigen. failure: - inactive: Je account is nog niet geactiveerd. invalid: E-mailadres of wachtwoord is onjuist. invalid_token: Verkeerde authenticatie token. - locked: Je account is vergrendeld. - timeout: 'Je sessie is verlopen, log opnieuw in om verder te gaan.' - unauthenticated: Je moet een account aanmaken voordat je kan verder gaan. - unconfirmed: Je moet je account bevestigen voordat je kan verder gaan. - mailer: - confirmation_instructions: - subject: Bevestig je account - reset_password_instructions: - subject: Wijzig je wachtwoord - unlock_instructions: - subject: Ontgrendel je account - oauth_callbacks: - failure: 'We konden je niet autoriseren van %{kind} omdat %{reason}.' - success: 'Succesvol geautoriseerd van %{kind} account.' unlocks: - send_instructions: Binnen enkele minuten ontvang je een e-mail om je account te ontgrendelen. unlocked: Je account is succesvol ontgrendeld. Je bent nu ingelogd. user_passwords: spree_user: cannot_be_blank: Je wachtwoord kan niet leeg zijn. - send_instructions: Binnen enkele minuten ontvang je een e-mail met instructies om je wachtwoord te resetten. - updated: Je wachtwoord is succesvol gewijzigd. Je bent nu ingelogd. - user_registrations: - destroyed: Tot ziens! Je account is succesvol opgezegd. We hopen je snel terug te zien. - inactive_signed_up: 'Je bent succesvol aangemeld. Maar we kunnen je niet inloggen omdat je account is %{reason}.' - signed_up: Welkom! Je bent succesvol aangemeld. - updated: Je account is succesvol aangepast. - user_sessions: - signed_in: Succesvol ingelogd. - signed_out: Succesvol uitgelogd. errors: messages: - already_confirmed: is al bevestigd email_is_invalid: e-mail adres mag niet leeg zijn - not_found: niet gevonden - not_locked: is niet vergrendeld - not_saved: - one: '1 fout tijdens het opslaan van %{resource}' - other: '%{count} fouten tijdens het opslaan van %{resource}' diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index 10f1cd179..a465ac2ec 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -5,47 +5,14 @@ pt-BR: devise: confirmations: confirmed: Sua conta foi confirmada com sucesso. Agora você está conectado. - send_instructions: Você receberá um e-mail com instruções sobre como confirmar sua conta em poucos minutos. failure: - inactive: Sua conta não foi ativada ainda. invalid: Email ou senha inválida. invalid_token: Token de autenticação inválido. - locked: Sua conta está bloqueada. - timeout: 'Sua sessão expirou, por favor entre novamente para continuar.' - unauthenticated: Você precisa conectar ou cadastrar-se antes de continuar. - unconfirmed: Voce tem que confirmar sua conta antes de continuar. - mailer: - confirmation_instructions: - subject: Instruções de confirmação - reset_password_instructions: - subject: Instruções de redefinição de senha - unlock_instructions: - subject: Instruções de desbloqueio - oauth_callbacks: - failure: '%{kind} não foi autorizada porque %{reason}.' - success: 'Conta %{kind} foi autorizada com sucesso.' unlocks: - send_instructions: Você receberá um e-mail com instruções sobre como desbloquear sua conta em poucos minutos. unlocked: Sua conta foi desbloqueada com sucesso. Agora você está conectado. user_passwords: spree_user: cannot_be_blank: Sua senha não pode estar em branco. - send_instructions: Você receberá um e-mail com instruções sobre como redefinir sua senha em poucos minutos. - updated: Sua senha foi alterada com sucesso. Agora você está conectado. - user_registrations: - destroyed: Até logo! Sua conta foi cancelada com sucesso. Esperamos ver você em breve. - inactive_signed_up: 'Seu cadastro foi feito com sucesso. No entanto, não o conectamos porque sua conta está %{reason}.' - signed_up: Bem vindo! Seu cadastro foi feito com sucesso. - updated: Sua conta foi atualizada com sucesso. - user_sessions: - signed_in: Entrou com sucesso. - signed_out: Saiu com sucesso. errors: messages: - already_confirmed: já foi confirmado email_is_invalid: E-mail não pode estar em branco - not_found: não encontrado - not_locked: não bloqueado - not_saved: - one: '1 erro não permitiu este %{resource} ser salvo:' - other: '%{count} erros não permitiram %{resource} ser salvo:' diff --git a/config/locales/pt.yml b/config/locales/pt.yml index 3caaa1c49..3be42ffac 100644 --- a/config/locales/pt.yml +++ b/config/locales/pt.yml @@ -6,50 +6,17 @@ pt: devise: confirmations: confirmed: A sua conta foi confirmada com sucesso. Já se encontra conectado. - send_instructions: Receberá, brevemente, um e-mail com as instruções de confirmação da sua conta. failure: - inactive: A sua conta ainda não foi ativada. invalid: E-mail ou senha inválida. invalid_token: Token de autenticação inválido. - locked: A sua conta está bloqueada. - timeout: A sua sessão expirou! Por favor, entre novamente para continuar. - unauthenticated: Precisa de se autenticar ou de se registar antes de continuar. - unconfirmed: Precisa de confirmar a sua conta antes de continuar. - mailer: - confirmation_instructions: - subject: Instruções de confirmação - reset_password_instructions: - subject: Instruções de redefinição de senha - unlock_instructions: - subject: Instruções de desbloqueio - oauth_callbacks: - failure: '%{kind} não foi autorizada porque %{reason}.' - success: 'Conta %{kind} foi autorizada com sucesso.' unlocks: - send_instructions: Receberá um e-mail com as instruções de desbloqueio da sua conta em poucos minutos. unlocked: A sua conta foi desbloqueada com sucesso. Já se encontra conectado. user_passwords: spree_user: cannot_be_blank: A sua senha não pode estar em branco. - send_instructions: Receberá um e-mail com as instruções de redefinição da sua senha em poucos minutos. - no_token: "Não pode aceder a esta página sem ser através de um e-mail de redefinição de senha. Se está a aceder através de um e-mail de redefinição de senha, verifique se está a usar o URL completo." - updated: A sua senha foi alterada com sucesso. Já se encontra conectado. - user_registrations: - destroyed: Até logo! A sua conta foi cancelada com sucesso. Esperamos voltar a vê-lo em breve. - inactive_signed_up: 'O seu registo foi concluído com sucesso. No entanto, não conectado porque a sua conta está %{reason}.' - signed_up: Bem vindo! O seu registo foi concluído com sucesso. - updated: A sua conta foi atualizada com sucesso. user_sessions: - signed_in: Entrou com sucesso. - signed_out: Saiu com sucesso. already_signed_in: Já está conectado. already_signed_out: Já não está conectado. errors: messages: - already_confirmed: já foi confirmado email_is_invalid: O e-mail não pode estar em branco - not_found: não foi encontrado - not_locked: não estava bloqueado - not_saved: - one: '1 erro não permitiu que este %{resource} fosse guardado:' - other: '%{count} erros não permitiram que este %{resource} fosse guardado:' diff --git a/config/locales/tr.yml b/config/locales/tr.yml index 4079421a6..973b8b966 100644 --- a/config/locales/tr.yml +++ b/config/locales/tr.yml @@ -3,47 +3,14 @@ tr: devise: confirmations: confirmed: Hesabınız başarıyla doğrulandı. Oturumunuz açıldı. - send_instructions: Birkaç dakika içinde hesabınızı nasıl doğrulayacağınızı anlatan bir e-posta alacaksınız. failure: - inactive: Hesabınız henüz faal değil. invalid: Geçersiz e-posta ya da şifre. invalid_token: Geçersiz anahtar. - locked: Hesabınız kilitlendi. - timeout: 'Oturumunuzun süresi doldu, devam etmek için lütfen giriş yapın.' - unauthenticated: Devam etmek için üye olmalı ya da giriş yapmalısınız. - unconfirmed: Devam etmek için hesabınızı doğrulamalısınız. - mailer: - confirmation_instructions: - subject: Doğrulama Talimatları - reset_password_instructions: - subject: Şifre Sıfırlama Talimatları - unlock_instructions: - subject: Kilit Açma Talimatları - oauth_callbacks: - failure: 'Sizi %{kind} üzerinden %{reason} sebebiyle yetkilendiremedik.' - success: '%{kind} hesabından başarıyla yetkilendirildiniz.' unlocks: - send_instructions: Birkaç dakika içinde hesabınızın kilidini nasıl açacağınızı anlatan bir e-posta alacaksınız. unlocked: Hesabınızın kilidi başarıyla açıldı. Oturumunuz açıldı. user_passwords: spree_user: cannot_be_blank: Boş parola giremezsiniz. - send_instructions: Birkaç dakika içinde şifrenizi nasıl yeniden ayarlayacağınızı anlatan bir e-posta alacaksınız. - updated: Şifreniz başarıyla değiştirildi. Oturumunuz açıldı. - user_registrations: - destroyed: Güle Güle! Hesabınız başarıyla iptal edildi. Sizi tekrar aramızda görmeyi umuyoruz. - inactive_signed_up: 'Başarıyla kayıt oldunuz. Ancak oturumunuzu %{reason} sebebiyle açamadık.' - signed_up: 'Hoşgeldiniz! Başarıyla kayıt oldunuz.' - updated: Hesabınız başarıyla güncellendi. - user_sessions: - signed_in: Giriş başarılı oldu. - signed_out: Çıkış başarılı oldu. errors: messages: - already_confirmed: zaten doğrulanmış email_is_invalid: e-posta adresi boş olamaz - not_found: kayıt yok - not_locked: kilitli değil - not_saved: - one: '1 hata yüzünden %{resource} kaynağı kaydedilemedi:' - other: '%{count} sayıda hata yüzünden %{resource} kaynağı kaydedilemedi:' diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index e1aa81dbc..5b794a253 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -6,53 +6,19 @@ zh-TW: devise: confirmations: confirmed: 你的帳號已經確認完成,現在你已經登入網站了。 - send_instructions: 你會在幾分鐘內收到一封帳號確認信來確認你的帳號。 spree_user: already_confirmed: Email 已確認,請登入。 failure: - inactive: 你的帳號尚未啟用。 invalid: 帳號或密碼有誤。 invalid_token: 錯誤的認證代碼。 - locked: 你的帳號已經被停權,請聯絡客服人員。 - timeout: 你的登入已經逾時,請重新登入。 - unauthenticated: 你需要登入來繼續。 - unconfirmed: 你的帳號需要確認來繼續。 - mailer: - confirmation_instructions: - subject: 帳號確認教學 - reset_password_instructions: - subject: 重設密碼教學 - unlock_instructions: - subject: 帳號解鎖教學 - oauth_callbacks: - failure: '由於%{reason},無法透過%{kind}確認你的帳號。' - success: '成功的由%{kind}認證你的帳號。' unlocks: - send_instructions: 你在幾分鐘後會收到一封 Email 教你如何解鎖帳號。 unlocked: 你的帳號已經解鎖,現在你已經登入網站了。 user_passwords: spree_user: cannot_be_blank: 密碼不能為空白。 - no_token: "你只能透過重新設定密碼的 Email 內的連結來訪問此頁面。如果你真的是透過那封 Email 來此頁面,請確定你是透過完整的網址過來的。" - send_instructions: 你在幾分鐘後會收到一封 Email 教你如何更改密碼。 - updated: 你的密碼已經更改成功,你已成功登入。 - user_registrations: - destroyed: 再見!你的帳號已經被取消了,但我們希望能再服務你。 - inactive_signed_up: '你已經成功註冊,但由於%{reason}的原因,導致帳號無法登入。' - signed_up_but_unconfirmed: 確認信件已經寄到您的信箱,請按照上面的教學完成您的註冊。 - signed_up: 歡迎!你已經成功註冊了。 - updated: 你的帳號已經成功更新。 user_sessions: - signed_in: 登入成功 - signed_out: 登出成功 already_signed_in: 已經登入 already_signed_out: 已經登入 errors: messages: - already_confirmed: 已確認 email_is_invalid: Email 不能為空值 - not_found: 找不到 - not_locked: 沒有被鎖住 - not_saved: - one: '%{resource}由於以下的一個錯誤導致無法被儲存:' - other: '%{resource}由於以下的%{count}個錯誤導致無法被儲存:' diff --git a/spree_auth_devise.gemspec b/spree_auth_devise.gemspec index edb9bddde..b162145e2 100644 --- a/spree_auth_devise.gemspec +++ b/spree_auth_devise.gemspec @@ -32,6 +32,7 @@ Gem::Specification.new do |s| s.add_dependency 'devise', '~> 4.7' s.add_dependency 'devise-encryptable', '0.2.0' + s.add_dependency 'devise-i18n' spree_version = '>= 4.1', '< 5.0' s.add_dependency 'spree_core', spree_version