Download as
Browse Code »

Commit f455c0466cd4293b300149cb0b10916ade49c652

Authored by Heitor
Committed by Rafael Manzo
1 parent 61dba93d
Exists in colab and in 4 other branches master, spb-master, spb-stable, stable

Finished devise translations 

Signed-off-by: Pedro Scocco <pedroscocco@gmail.com>
Showing 6 changed files with 99 additions and 61 deletions   Show diff stats
app/views/devise/passwords/new.html.erb
  Diff comments   View file @f455c04
@@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
14 </div> 14 </div>
15 <div class="help-container"> 15 <div class="help-container">
16 <p> 16 <p>
17 - The same email address used to sign up. 17 + <%= t('.same_email') %>
18 </p> 18 </p>
19 </div> 19 </div>
20 </div> 20 </div>
app/views/devise/registrations/edit.html.erb
  Diff comments   View file @f455c04
@@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@
13 </div> 13 </div>
14 <div class="help-container"> 14 <div class="help-container">
15 <p> 15 <p>
16 - Your full name. 16 + <%= t('.your_full_name')%>
17 </p> 17 </p>
18 </div> 18 </div>
19 </div> 19 </div>
@@ -29,7 +29,7 @@ @@ -29,7 +29,7 @@
29 </div> 29 </div>
30 <div class="help-container"> 30 <div class="help-container">
31 <p> 31 <p>
32 - Your email is our communication channel. Make sure you have typed it correctly. 32 + <%= t('.your_email_is_our_communication_channel')%>
33 </p> 33 </p>
34 </div> 34 </div>
35 </div> 35 </div>
@@ -41,7 +41,7 @@ @@ -41,7 +41,7 @@
41 </div> 41 </div>
42 <div class="help-container"> 42 <div class="help-container">
43 <p> 43 <p>
44 - Your password must have at least 8 characters. Strong passwords contain numbers, symbols, upper and lowercase characters. 44 + <%= t('.password_instructions')%>
45 </p> 45 </p>
46 </div> 46 </div>
47 </div> 47 </div>
@@ -53,7 +53,7 @@ @@ -53,7 +53,7 @@
53 </div> 53 </div>
54 <div class="help-container"> 54 <div class="help-container">
55 <p> 55 <p>
56 - Confirm your password. 56 + <%= t('.confirm_your_password')%>
57 </p> 57 </p>
58 </div> 58 </div>
59 </div> 59 </div>
@@ -65,7 +65,7 @@ @@ -65,7 +65,7 @@
65 </div> 65 </div>
66 <div class="help-container"> 66 <div class="help-container">
67 <p> 67 <p>
68 - Your current password is needed to confirm your changes. 68 + <%= t('.current_password_required')%>
69 </p> 69 </p>
70 </div> 70 </div>
71 </div> 71 </div>
app/views/devise/registrations/new.html.erb
  Diff comments   View file @f455c04
@@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
14 </div> 14 </div>
15 <div class="help-container"> 15 <div class="help-container">
16 <p> 16 <p>
17 - Your full name. 17 + <%= t('.your_full_name')%>
18 </p> 18 </p>
19 </div> 19 </div>
20 </div> 20 </div>
@@ -26,7 +26,7 @@ @@ -26,7 +26,7 @@
26 </div> 26 </div>
27 <div class="help-container"> 27 <div class="help-container">
28 <p> 28 <p>
29 - Your email is our communication channel. Make sure you have typed it correctly. 29 + <%= t('.your_email_is_our_communication_channel')%>
30 </p> 30 </p>
31 </div> 31 </div>
32 </div> 32 </div>
@@ -38,7 +38,7 @@ @@ -38,7 +38,7 @@
38 </div> 38 </div>
39 <div class="help-container"> 39 <div class="help-container">
40 <p> 40 <p>
41 - Your password must have at least 8 characters. Strong passwords contain numbers, symbols, upper and lowercase characters. 41 + <%= t('.password_instructions')%>
42 </p> 42 </p>
43 </div> 43 </div>
44 </div> 44 </div>
@@ -50,7 +50,7 @@ @@ -50,7 +50,7 @@
50 </div> 50 </div>
51 <div class="help-container"> 51 <div class="help-container">
52 <p> 52 <p>
53 - Confirm your password. 53 + <%= t('.confirm_your_password')%>
54 </p> 54 </p>
55 </div> 55 </div>
56 </div> 56 </div>
app/views/devise/sessions/new.html.erb
  Diff comments   View file @f455c04
@@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
12 </div> 12 </div>
13 <div class="help-container"> 13 <div class="help-container">
14 <p> 14 <p>
15 - The same email address used to sign up. 15 + <%= t('.same_email') %>
16 </p> 16 </p>
17 </div> 17 </div>
18 </div> 18 </div>
@@ -24,7 +24,7 @@ @@ -24,7 +24,7 @@
24 </div> 24 </div>
25 <div class="help-container"> 25 <div class="help-container">
26 <p> 26 <p>
27 - If you forgot your password, follow this <a href="/users/password/new">link</a> to reset it. 27 + <%= t('.forgot_password_link_html', link: link_to("link", "/users/password/new")) %>
28 </p> 28 </p>
29 </div> 29 </div>
30 </div> 30 </div>
@@ -36,7 +36,7 @@ @@ -36,7 +36,7 @@
36 </div> 36 </div>
37 <div class="help-container"> 37 <div class="help-container">
38 <p> 38 <p>
39 - Stay logged in. 39 + <%= t('.stay_logged_in')%>
40 </p> 40 </p>
41 </div> 41 </div>
42 </div> 42 </div>
config/locales/views/devise/en.yml
  Diff comments   View file @f455c04
1 en: 1 en:
  2 + dictionary:
  3 + same_email: &same_email The same email address used to sign up.
  4 + your_full_name: &your_full_name Your full name.
  5 + 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.
  6 + password_instructions: &password_instructions Your password must have at least 8 characters. Strong passwords contain numbers, symbols, upper and lowercase characters.
  7 + confirm_your_password: &confirm_your_password Confirm your password.
  8 + activerecord:
  9 + attributes:
  10 + user:
  11 + current_password: Current password
  12 + email: Email
  13 + password: Password
  14 + password_confirmation: Password confirmation
  15 + remember_me: Remember me
  16 + models:
  17 + user: User
2 devise: 18 devise:
3 confirmations: 19 confirmations:
4 new: 20 new:
5 - resend_confirmation_instructions: "Resend confirmation instructions" 21 + resend_confirmation_instructions: Resend confirmation instructions
6 mailer: 22 mailer:
7 confirmation_instructions: 23 confirmation_instructions:
8 - action: "Confirm my account"  
9 - greeting: "Welcome %{recipient}!"  
10 - instruction: "You can confirm your account email through the link below:" 24 + action: Confirm my account
  25 + greeting: Welcome %{recipient}!
  26 + instruction: 'You can confirm your account email through the link below:'
11 reset_password_instructions: 27 reset_password_instructions:
12 - action: "Change my password"  
13 - greeting: "Hello %{recipient}!"  
14 - instruction: "Someone has requested a link to change your password, and you can do this through the link below."  
15 - instruction_2: "If you didn't request this, please ignore this email."  
16 - instruction_3: "Your password won't change until you access the link above and create a new one." 28 + action: Change my password
  29 + greeting: Hello %{recipient}!
  30 + instruction: Someone has requested a link to change your password, and you can do this through the link below.
  31 + instruction_2: If you didn't request this, please ignore this email.
  32 + instruction_3: Your password won't change until you access the link above and create a new one.
17 unlock_instructions: 33 unlock_instructions:
18 - action: "Unlock my account"  
19 - greeting: "Hello %{recipient}!"  
20 - instruction: "Click the link below to unlock your account:"  
21 - message: "Your account has been locked due to an excessive amount of unsuccessful sign in attempts." 34 + action: Unlock my account
  35 + greeting: Hello %{recipient}!
  36 + instruction: 'Click the link below to unlock your account:'
  37 + message: Your account has been locked due to an excessive amount of unsuccessful sign in attempts.
22 passwords: 38 passwords:
23 - new:  
24 - forgot_your_password: "Forgot your password?"  
25 - send_me_reset_password_instructions: "Send me reset password instructions"  
26 edit: 39 edit:
27 - change_your_password: "Change your password"  
28 - new_password: "New password"  
29 - confirm_new_password: "Confirm new password"  
30 - change_my_password: "Change my password" 40 + change_my_password: Change my password
  41 + change_your_password: Change your password
  42 + confirm_new_password: Confirm new password
  43 + new_password: New password
  44 + new:
  45 + same_email: *same_email
  46 + forgot_your_password: Forgot your password?
  47 + send_me_reset_password_instructions: Send me reset password instructions
31 registrations: 48 registrations:
32 edit: 49 edit:
33 - are_you_sure: "Are you sure?"  
34 - cancel_my_account: "Cancel my account"  
35 - leave_blank_if_you_don_t_want_to_change_it: "leave blank if you dont want to change it"  
36 - currently_waiting_confirmation_for_email: "Currently waiting confirmation for: %{email}"  
37 - title: "Edit %{resource}"  
38 - we_need_your_current_password_to_confirm_your_changes: "we need your current password to confirm your changes"  
39 - update: "Update"  
40 - unhappy: "Unhappy" 50 + are_you_sure: Are you sure?
  51 + cancel_my_account: Cancel my account
  52 + currently_waiting_confirmation_for_email: 'Currently waiting confirmation for: %{email}'
  53 + leave_blank_if_you_don_t_want_to_change_it: leave blank if you dont want to change it
  54 + title: Edit %{resource}
  55 + unhappy: Unhappy
  56 + update: Update
  57 + we_need_your_current_password_to_confirm_your_changes: we need your current password to confirm your changes
  58 + current_password_required: Your current password is needed to confirm your changes.
  59 + your_full_name: *your_full_name
  60 + your_email_is_our_communication_channel: *your_email_is_our_communication_channel
  61 + password_instructions: *password_instructions
  62 + confirm_your_password: *confirm_your_password
41 new: 63 new:
42 - sign_up: "Sign up" 64 + sign_up: Sign up
  65 + your_full_name: *your_full_name
  66 + your_email_is_our_communication_channel: *your_email_is_our_communication_channel
  67 + password_instructions: *password_instructions
  68 + confirm_your_password: *confirm_your_password
43 sessions: 69 sessions:
44 new: 70 new:
45 - sign_in: "Sign in" 71 + sign_in: Sign in
  72 + same_email: *same_email
  73 + forgot_password_link_html: If you forgot your password, follow this %{link} to reset it.
  74 + stay_logged_in: Stay logged in.
46 shared: 75 shared:
47 links: 76 links:
48 - back: "Back"  
49 - didn_t_receive_confirmation_instructions: "Didn't receive confirmation instructions?"  
50 - didn_t_receive_unlock_instructions: "Didn't receive unlock instructions?"  
51 - forgot_your_password: "Forgot your password?"  
52 - sign_in: "Sign in"  
53 - sign_in_with_provider: "Sign in with %{provider}"  
54 - sign_up: "Sign up" 77 + back: Back
  78 + didn_t_receive_confirmation_instructions: Didn't receive confirmation instructions?
  79 + didn_t_receive_unlock_instructions: Didn't receive unlock instructions?
  80 + forgot_your_password: Forgot your password?
  81 + sign_in: Sign in
  82 + sign_in_with_provider: Sign in with %{provider}
  83 + sign_up: Sign up
55 unlocks: 84 unlocks:
56 new: 85 new:
57 - resend_unlock_instructions: "Resend unlock instructions"  
58 - activerecord:  
59 - models:  
60 - user: "User"  
61 - attributes:  
62 - user:  
63 - email: "Email"  
64 - password: "Password"  
65 - password_confirmation: "Password confirmation"  
66 - current_password: "Current password"  
67 - remember_me: "Remember me" 86 + resend_unlock_instructions: Resend unlock instructions
config/locales/views/devise/pt.yml
  Diff comments   View file @f455c04
1 pt: 1 pt:
  2 + dictionary:
  3 + same_email: &same_email O mesmo endereço de email usado para registrar.
  4 + your_full_name: &your_full_name Seu nome completo.
  5 + 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.
  6 + 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.
  7 + confirm_your_password: &confirm_your_password Confirme sua senha.
2 activerecord: 8 activerecord:
3 attributes: 9 attributes:
4 user: 10 user:
@@ -36,6 +42,7 @@ pt: @@ -36,6 +42,7 @@ pt:
36 confirm_new_password: Confirme sua nova senha 42 confirm_new_password: Confirme sua nova senha
37 new_password: Nova senha 43 new_password: Nova senha
38 new: 44 new:
  45 + same_email: *same_email
39 forgot_your_password: Esqueceu sua senha? 46 forgot_your_password: Esqueceu sua senha?
40 send_me_reset_password_instructions: Enviar instruções para redefinição da senha 47 send_me_reset_password_instructions: Enviar instruções para redefinição da senha
41 registrations: 48 registrations:
@@ -48,11 +55,23 @@ pt: @@ -48,11 +55,23 @@ pt:
48 unhappy: Não está contente 55 unhappy: Não está contente
49 update: Atualizar 56 update: Atualizar
50 we_need_your_current_password_to_confirm_your_changes: precisamos da sua senha atual para confirmar suas mudanças 57 we_need_your_current_password_to_confirm_your_changes: precisamos da sua senha atual para confirmar suas mudanças
  58 + current_password_required: Sua senha atual é necessária para confirmar as mudanças.
  59 + your_full_name: *your_full_name
  60 + your_email_is_our_communication_channel: *your_email_is_our_communication_channel
  61 + password_instructions: *password_instructions
  62 + confirm_your_password: *confirm_your_password
51 new: 63 new:
52 sign_up: Inscrever-se 64 sign_up: Inscrever-se
  65 + your_full_name: *your_full_name
  66 + your_email_is_our_communication_channel: *your_email_is_our_communication_channel
  67 + password_instructions: *password_instructions
  68 + confirm_your_password: *confirm_your_password
53 sessions: 69 sessions:
54 new: 70 new:
55 sign_in: Login 71 sign_in: Login
  72 + same_email: *same_email
  73 + forgot_password_link_html: Se você esqueceu sua senha, clique neste %{link} para redefini-la.
  74 + stay_logged_in: Continuar logado.
56 shared: 75 shared:
57 links: 76 links:
58 back: Voltar 77 back: Voltar