diff --git a/app/views/devise/passwords/new.html.erb b/app/views/devise/passwords/new.html.erb index 0b6692c..05fd134 100644 --- a/app/views/devise/passwords/new.html.erb +++ b/app/views/devise/passwords/new.html.erb @@ -14,7 +14,7 @@

- The same email address used to sign up. + <%= t('.same_email') %>

diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb index 08cb0d9..990d8a6 100644 --- a/app/views/devise/registrations/edit.html.erb +++ b/app/views/devise/registrations/edit.html.erb @@ -13,7 +13,7 @@

- Your full name. + <%= t('.your_full_name')%>

@@ -29,7 +29,7 @@

- Your email is our communication channel. Make sure you have typed it correctly. + <%= t('.your_email_is_our_communication_channel')%>

@@ -41,7 +41,7 @@

- Your password must have at least 8 characters. Strong passwords contain numbers, symbols, upper and lowercase characters. + <%= t('.password_instructions')%>

@@ -53,7 +53,7 @@

- Confirm your password. + <%= t('.confirm_your_password')%>

@@ -65,7 +65,7 @@

- Your current password is needed to confirm your changes. + <%= t('.current_password_required')%>

diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb index aa76673..3ab42d7 100644 --- a/app/views/devise/registrations/new.html.erb +++ b/app/views/devise/registrations/new.html.erb @@ -14,7 +14,7 @@

- Your full name. + <%= t('.your_full_name')%>

@@ -26,7 +26,7 @@

- Your email is our communication channel. Make sure you have typed it correctly. + <%= t('.your_email_is_our_communication_channel')%>

@@ -38,7 +38,7 @@

- Your password must have at least 8 characters. Strong passwords contain numbers, symbols, upper and lowercase characters. + <%= t('.password_instructions')%>

@@ -50,7 +50,7 @@

- Confirm your password. + <%= t('.confirm_your_password')%>

diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb index a1ae9ef..57539e2 100644 --- a/app/views/devise/sessions/new.html.erb +++ b/app/views/devise/sessions/new.html.erb @@ -12,7 +12,7 @@

- The same email address used to sign up. + <%= t('.same_email') %>

@@ -24,7 +24,7 @@

- If you forgot your password, follow this link to reset it. + <%= t('.forgot_password_link_html', link: link_to("link", "/users/password/new")) %>

@@ -36,7 +36,7 @@

- Stay logged in. + <%= t('.stay_logged_in')%>

diff --git a/config/locales/views/devise/en.yml b/config/locales/views/devise/en.yml index a5c5cc6..b3c135f 100644 --- a/config/locales/views/devise/en.yml +++ b/config/locales/views/devise/en.yml @@ -1,67 +1,86 @@ en: + dictionary: + same_email: &same_email The same email address used to sign up. + your_full_name: &your_full_name Your full name. + your_email_is_our_communication_channel: &your_email_is_our_communication_channel Your email is our communication channel. Make sure you have typed it correctly. + password_instructions: &password_instructions Your password must have at least 8 characters. Strong passwords contain numbers, symbols, upper and lowercase characters. + confirm_your_password: &confirm_your_password Confirm your password. + activerecord: + attributes: + user: + current_password: Current password + email: Email + password: Password + password_confirmation: Password confirmation + remember_me: Remember me + models: + user: User devise: confirmations: new: - resend_confirmation_instructions: "Resend confirmation instructions" + resend_confirmation_instructions: Resend confirmation instructions mailer: confirmation_instructions: - action: "Confirm my account" - greeting: "Welcome %{recipient}!" - instruction: "You can confirm your account email through the link below:" + action: Confirm my account + greeting: Welcome %{recipient}! + instruction: 'You can confirm your account email through the link below:' reset_password_instructions: - action: "Change my password" - greeting: "Hello %{recipient}!" - instruction: "Someone has requested a link to change your password, and you can do this through the link below." - instruction_2: "If you didn't request this, please ignore this email." - instruction_3: "Your password won't change until you access the link above and create a new one." + action: Change my password + greeting: Hello %{recipient}! + instruction: Someone has requested a link to change your password, and you can do this through the link below. + instruction_2: If you didn't request this, please ignore this email. + instruction_3: Your password won't change until you access the link above and create a new one. unlock_instructions: - action: "Unlock my account" - greeting: "Hello %{recipient}!" - instruction: "Click the link below to unlock your account:" - message: "Your account has been locked due to an excessive amount of unsuccessful sign in attempts." + action: Unlock my account + greeting: Hello %{recipient}! + instruction: 'Click the link below to unlock your account:' + message: Your account has been locked due to an excessive amount of unsuccessful sign in attempts. passwords: - new: - forgot_your_password: "Forgot your password?" - send_me_reset_password_instructions: "Send me reset password instructions" edit: - change_your_password: "Change your password" - new_password: "New password" - confirm_new_password: "Confirm new password" - change_my_password: "Change my password" + change_my_password: Change my password + change_your_password: Change your password + confirm_new_password: Confirm new password + new_password: New password + new: + same_email: *same_email + forgot_your_password: Forgot your password? + send_me_reset_password_instructions: Send me reset password instructions registrations: edit: - are_you_sure: "Are you sure?" - cancel_my_account: "Cancel my account" - leave_blank_if_you_don_t_want_to_change_it: "leave blank if you dont want to change it" - currently_waiting_confirmation_for_email: "Currently waiting confirmation for: %{email}" - title: "Edit %{resource}" - we_need_your_current_password_to_confirm_your_changes: "we need your current password to confirm your changes" - update: "Update" - unhappy: "Unhappy" + are_you_sure: Are you sure? + cancel_my_account: Cancel my account + currently_waiting_confirmation_for_email: 'Currently waiting confirmation for: %{email}' + leave_blank_if_you_don_t_want_to_change_it: leave blank if you dont want to change it + title: Edit %{resource} + unhappy: Unhappy + update: Update + we_need_your_current_password_to_confirm_your_changes: we need your current password to confirm your changes + current_password_required: Your current password is needed to confirm your changes. + your_full_name: *your_full_name + your_email_is_our_communication_channel: *your_email_is_our_communication_channel + password_instructions: *password_instructions + confirm_your_password: *confirm_your_password new: - sign_up: "Sign up" + sign_up: Sign up + your_full_name: *your_full_name + your_email_is_our_communication_channel: *your_email_is_our_communication_channel + password_instructions: *password_instructions + confirm_your_password: *confirm_your_password sessions: new: - sign_in: "Sign in" + sign_in: Sign in + same_email: *same_email + forgot_password_link_html: If you forgot your password, follow this %{link} to reset it. + stay_logged_in: Stay logged in. shared: links: - back: "Back" - didn_t_receive_confirmation_instructions: "Didn't receive confirmation instructions?" - didn_t_receive_unlock_instructions: "Didn't receive unlock instructions?" - forgot_your_password: "Forgot your password?" - sign_in: "Sign in" - sign_in_with_provider: "Sign in with %{provider}" - sign_up: "Sign up" + back: Back + didn_t_receive_confirmation_instructions: Didn't receive confirmation instructions? + didn_t_receive_unlock_instructions: Didn't receive unlock instructions? + forgot_your_password: Forgot your password? + sign_in: Sign in + sign_in_with_provider: Sign in with %{provider} + sign_up: Sign up unlocks: new: - resend_unlock_instructions: "Resend unlock instructions" - activerecord: - models: - user: "User" - attributes: - user: - email: "Email" - password: "Password" - password_confirmation: "Password confirmation" - current_password: "Current password" - remember_me: "Remember me" + resend_unlock_instructions: Resend unlock instructions diff --git a/config/locales/views/devise/pt.yml b/config/locales/views/devise/pt.yml index a3811f6..f5df63c 100644 --- a/config/locales/views/devise/pt.yml +++ b/config/locales/views/devise/pt.yml @@ -1,4 +1,10 @@ pt: + dictionary: + same_email: &same_email O mesmo endereço de email usado para registrar. + your_full_name: &your_full_name Seu nome completo. + your_email_is_our_communication_channel: &your_email_is_our_communication_channel Seu email é o nosso canal de comunicação. Assegure-se de que tenha o digitado corretamente. + password_instructions: &password_instructions Sua senha precisa ter pelo menos 8 caracteres. Senhas fortes contêm números, símbolos e letras maiúsculas e minúsculas. + confirm_your_password: &confirm_your_password Confirme sua senha. activerecord: attributes: user: @@ -36,6 +42,7 @@ pt: confirm_new_password: Confirme sua nova senha new_password: Nova senha new: + same_email: *same_email forgot_your_password: Esqueceu sua senha? send_me_reset_password_instructions: Enviar instruções para redefinição da senha registrations: @@ -48,11 +55,23 @@ pt: unhappy: Não está contente update: Atualizar we_need_your_current_password_to_confirm_your_changes: precisamos da sua senha atual para confirmar suas mudanças + current_password_required: Sua senha atual é necessária para confirmar as mudanças. + your_full_name: *your_full_name + your_email_is_our_communication_channel: *your_email_is_our_communication_channel + password_instructions: *password_instructions + confirm_your_password: *confirm_your_password new: sign_up: Inscrever-se + your_full_name: *your_full_name + your_email_is_our_communication_channel: *your_email_is_our_communication_channel + password_instructions: *password_instructions + confirm_your_password: *confirm_your_password sessions: new: sign_in: Login + same_email: *same_email + forgot_password_link_html: Se você esqueceu sua senha, clique neste %{link} para redefini-la. + stay_logged_in: Continuar logado. shared: links: back: Voltar -- libgit2 0.21.2