Download as
Browse Code »

Commit 0975a9e2c36fdc3da439c2c66d728cfd4910b80b

Authored by Rafael Manzo
1 parent df02384d
Exists in colab and in 4 other branches master, spb-master, spb-stable, stable

Regenerated Devise views with i18n

Showing 19 changed files with 227 additions and 366 deletions   Show diff stats
Gemfile
  Diff comments   View file @0975a9e
... ... @@ -66,6 +66,10 @@ gem 'google-analytics-rails', '~> 0.0.6'
66 66 # Browser language detection
67 67 gem 'http_accept_language'
68 68  
  69 +# Devise translations
  70 +gem 'devise-i18n'
  71 +gem 'devise-i18n-views'
  72 +
69 73 group :test do
70 74 # Easier test writing
71 75 gem "shoulda-matchers", '~> 2.8.0'
... ...
Gemfile.lock
  Diff comments   View file @0975a9e
... ... @@ -116,6 +116,8 @@ GEM
116 116 responders
117 117 thread_safe (~> 0.1)
118 118 warden (~> 1.2.3)
  119 + devise-i18n (0.12.0)
  120 + devise-i18n-views (0.3.4)
119 121 diff-lcs (1.2.5)
120 122 docile (1.1.5)
121 123 domain_name (0.5.23)
... ... @@ -339,6 +341,8 @@ DEPENDENCIES
339 341 dalli (~> 2.7.0)
340 342 database_cleaner (~> 1.4.1)
341 343 devise (~> 3.4.0)
  344 + devise-i18n
  345 + devise-i18n-views
342 346 exception_notification (~> 4.0.1)
343 347 factory_girl_rails (~> 4.5.0)
344 348 google-analytics-rails (~> 0.0.6)
... ...
app/views/devise/_links.erb 0 → 100644
  Diff comments   View file @0975a9e
... ... @@ -0,0 +1,3 @@
  1 +<% ActiveSupport::Deprecation.warn "Rendering partials devise/_links.erb is deprecated" \
  2 + "please use devise/shared/_links.erb instead."%>
  3 +<%= render "shared/links" %>
0 4 \ No newline at end of file
... ...
app/views/devise/confirmations/new.html.erb
  Diff comments   View file @0975a9e
1   -<div class="page-header">
2   - <h1>Resend confirmation instructions</h1>
3   -</div>
  1 +<h2><%= t('.resend_confirmation_instructions', :default => 'Resend confirmation instructions') %></h2>
4 2  
5 3 <%= form_for(resource, :as => resource_name, :url => confirmation_path(resource_name), :html => { :method => :post }) do |f| %>
6 4 <%= devise_error_messages! %>
7 5  
8 6 <div><%= f.label :email %><br />
9   - <%= f.email_field :email, :autofocus => true %></div>
  7 + <%= f.email_field :email %></div>
10 8  
11   - <div><%= f.submit "Resend confirmation instructions", class: 'btn btn-default' %></div>
  9 + <div><%= f.submit t('.resend_confirmation_instructions', :default => 'Resend confirmation instructions') %></div>
12 10 <% end %>
13 11  
14 12 <%= render "devise/shared/links" %>
... ...
app/views/devise/mailer/confirmation_instructions.html.erb
  Diff comments   View file @0975a9e
1   -<p>Welcome <%= @email %>!</p>
  1 +<% require 'devise/version' %>
  2 +<p><%= t('.greeting', :recipient => @resource.email, :default => "Welcome #{@resource.email}!") %></p>
2 3  
3   -<p>You can confirm your account email through the link below:</p>
4   -
5   -<p><%= link_to 'Confirm my account', confirmation_url(@resource, :confirmation_token => @token) %></p>
  4 +<p><%= t('.instruction', :default => "You can confirm your account email through the link below:") %></p>
  5 +<p><%= link_to t('.action', :default => "Confirm my account"),
  6 + confirmation_url(@resource, :confirmation_token => (Devise::VERSION.start_with?('3.') ? @token : @resource.confirmation_token)) %></p>
6 7 \ No newline at end of file
... ...
app/views/devise/mailer/reset_password_instructions.html.erb
  Diff comments   View file @0975a9e
1   -<p>Hello <%= @resource.email %>!</p>
  1 +<% require 'devise/version' %>
  2 +<p><%= t('.greeting', :recipient => @resource.email, :default => "Hello #{@resource.email}!") %></p>
2 3  
3   -<p>Someone has requested a link to change your password. You can do this through the link below:</p>
  4 +<p><%= t('.instruction', :default => "Someone has requested a link to change your password, and you can do this through the link below.") %></p>
4 5  
5   -<p><%= link_to 'Change my password', edit_password_url(@resource, :reset_password_token => @token) %></p>
  6 +<p><%= link_to t('.action', :default => "Change my password"), edit_password_url(@resource, :reset_password_token => (Devise::VERSION.start_with?('3.') ? @token : @resource.reset_password_token)) %></p>
6 7  
7   -<p>If you did not request this, please ignore this email.</p>
8   -<p>Your password will not change until you access the link above and create a new one.</p>
  8 +<p><%= t('.instruction_2', :default => "If you didn't request this, please ignore this email.") %></p>
  9 +<p><%= t('.instruction_3', :default => "Your password won't change until you access the link above and create a new one.") %></p>
... ...
app/views/devise/mailer/unlock_instructions.html.erb
  Diff comments   View file @0975a9e
1   -<p>Hello <%= @resource.email %>!</p>
  1 +<% require 'devise/version' %>
  2 +<p><%= t('.greeting', :recipient => @resource.email, :default => "Hello #{@resource.email}!") %></p>
2 3  
3   -<p>Your account has been locked due to an excessive number of unsuccessful sign in attempts.</p>
  4 +<p><%= t('.message', :default => "Your account has been locked due to an excessive amount of unsuccessful sign in attempts.") %></p>
4 5  
5   -<p>Click the link below to unlock your account:</p>
  6 +<p><%= t('.instruction', :default => "Click the link below to unlock your account:") %></p>
6 7  
7   -<p><%= link_to 'Unlock my account', unlock_url(@resource, :unlock_token => @token) %></p>
  8 +<p><%= link_to t('.action', :default => "Unlock my account"), unlock_url(@resource, :unlock_token => (Devise::VERSION.start_with?('3.') ? @token :@resource.unlock_token)) %></p>
... ...
app/views/devise/passwords/edit.html.erb
  Diff comments   View file @0975a9e
1   -<div class="page-header">
2   - <h1>Change your password</h1>
3   -</div>
  1 +<h2><%= t('.change_your_password', :default => 'Change your password') %></h2>
4 2  
5 3 <%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put }) do |f| %>
6 4 <%= devise_error_messages! %>
7 5 <%= f.hidden_field :reset_password_token %>
8 6  
9   - <div><%= f.label :password, "New password" %><br />
10   - <%= f.password_field :password, :autofocus => true %></div>
  7 + <div><%= f.label :password, t('.new_password', :default => 'New password') %><br />
  8 + <%= f.password_field :password %></div>
11 9  
12   - <div><%= f.label :password_confirmation, "Confirm new password" %><br />
  10 + <div><%= f.label :password_confirmation, t('.confirm_new_password', :default => 'Confirm new password') %><br />
13 11 <%= f.password_field :password_confirmation %></div>
14 12  
15   - <div><%= f.submit "Change my password", class: 'btn btn-warning' %></div>
  13 + <div><%= f.submit t('.change_my_password', :default => 'Change my password') %></div>
16 14 <% end %>
17 15  
18 16 <%= render "devise/shared/links" %>
... ...
app/views/devise/passwords/new.html.erb
  Diff comments   View file @0975a9e
1   -<div class="page-header">
2   - <h1>Forgot your password?</h1>
3   -</div>
  1 +<h2><%= t('.forgot_your_password', :default => 'Forgot your password?') %></h2>
4 2  
5 3 <%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post }) do |f| %>
6 4 <%= devise_error_messages! %>
7 5  
8   - <div class="row margin-left-none">
9   - <div class="form-table col-md-9">
10   - <div class="form-row">
11   - <div class="field-container">
12   - <%= f.label :email, class: "control-label" %>
13   - <%= f.email_field :email, autofocus: true, class: 'text-field form-control' %>
14   - </div>
15   - <div class="help-container">
16   - <p>
17   - The same email address used to sign up.
18   - </p>
19   - </div>
20   - </div>
21   - </div>
22   - </div>
  6 + <div><%= f.label :email %><br />
  7 + <%= f.email_field :email %></div>
23 8  
24   - <div class="row margin-left-none" style="margin-top: 20px">
25   - <%= f.submit "Send me reset password instructions", class: 'btn btn-warning' %>
26   - <%= render "devise/shared/links" %>
27   - </div>
  9 + <div><%= f.submit t('.send_me_reset_password_instructions', :default => "Send me reset password instructions") %></div>
28 10 <% end %>
29 11  
  12 +<%= render "devise/shared/links" %>
... ...
app/views/devise/registrations/edit.html.erb
  Diff comments   View file @0975a9e
1   -<div class="page-header">
2   - <h1>Edit <%= resource_name.to_s.humanize %></h1>
3   -</div>
  1 +<h2><%= t('.title', :resource => resource_class.model_name.human , :default => "Edit #{resource_name.to_s.humanize}") %></h2>
4 2  
5   -<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put, :class => "form-inline" }) do |f| %>
  3 +<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f| %>
6 4 <%= devise_error_messages! %>
7 5  
8   - <div class="row margin-left-none">
9   - <div class="form-table col-md-9">
10   - <div class="form-row">
11   - <div class="field-container">
12   - <%= f.label :name, class: 'control-label' %><br />
13   - <%= f.text_field :name, :autofocus => true, class: 'text-field form-control' %>
14   - </div>
15   - <div class="help-container">
16   - <p>
17   - Your full name.
18   - </p>
19   - </div>
20   - </div>
  6 + <div><%= f.label :email %><br />
  7 + <%= f.email_field :email %></div>
21 8  
22   - <div class="form-row">
23   - <div class="field-container">
24   - <%= f.label :email, class: 'control-label' %><br />
25   - <%= f.email_field :email, class: 'text-field form-control' %>
  9 + <%- if devise_mapping.confirmable? && resource.pending_reconfirmation? -%>
  10 + <p>
  11 + <%= t('.currently_waiting_confirmation_for_email', :email => resource.unconfirmed_email, :default => "Currently waiting confirmation for: %{email}") %>
  12 + </p>
  13 + <%- end -%>
26 14  
27   - <% if devise_mapping.confirmable? && resource.pending_reconfirmation? %>
28   - <div>Currently waiting confirmation for: <%= resource.unconfirmed_email %></div>
29   - <% end %>
30   - </div>
31   - <div class="help-container">
32   - <p>
33   - Your email is our communication channel. Make sure you have typed it correctly.
34   - </p>
35   - </div>
36   - </div>
  15 + <div><%= f.label :password %> <i>(<%= t('.leave_blank_if_you_don_t_want_to_change_it', :default => "leave blank if you don't want to change it") %>)</i><br />
  16 + <%= f.password_field :password, :autocomplete => "off" %></div>
37 17  
38   - <div class="form-row">
39   - <div class="field-container">
40   - <%= f.label :password, class: 'control-label' %> <i>(leave it blank if you do not want to change it)</i><br />
41   - <%= f.password_field :password, :autocomplete => "off", class: 'text-field form-control' %>
42   - </div>
43   - <div class="help-container">
44   - <p>
45   - Your password must have at least 8 characters. Strong passwords contain numbers, symbols, upper and lowercase characters.
46   - </p>
47   - </div>
48   - </div>
  18 + <div><%= f.label :password_confirmation %><br />
  19 + <%= f.password_field :password_confirmation %></div>
49 20  
50   - <div class="form-row">
51   - <div class="field-container">
52   - <%= f.label :password_confirmation, class: 'control-label' %><br />
53   - <%= f.password_field :password_confirmation, class: 'text-field form-control' %>
54   - </div>
55   - <div class="help-container">
56   - <p>
57   - Confirm your password.
58   - </p>
59   - </div>
60   - </div>
  21 + <div><%= f.label :current_password %> <i>(<%= t('.we_need_your_current_password_to_confirm_your_changes', :default => 'we need your current password to confirm your changes') %>)</i><br />
  22 + <%= f.password_field :current_password %></div>
61 23  
62   - <div class="form-row">
63   - <div class="field-container">
64   - <%= f.label :current_password, class: 'control-label' %><br />
65   - <%= f.password_field :current_password, class: 'text-field form-control' %>
66   - </div>
67   - <div class="help-container">
68   - <p>
69   - Your current password is needed to confirm your changes.
70   - </p>
71   - </div>
72   - </div>
73   - </div>
74   - </div>
75   -
76   - <div class="row margin-left-none" style="margin-top: 20px">
77   - <%= f.submit "Update", class: 'btn btn-primary col-md-2' %>
78   - </div>
  24 + <div><%= f.submit t('.update', :default => "Update") %></div>
79 25 <% end %>
80 26  
81   -<hr />
  27 +<h3><%= t('.cancel_my_account', :default => 'Cancel my account') %></h3>
82 28  
83   -<h2>Cancel my account</h2>
  29 +<p><%= t('.unhappy', :default => 'Unhappy') %>? <%= link_to t('.cancel_my_account', :default => "Cancel my account"), registration_path(resource_name), :data => { :confirm => t('.are_you_sure', :default => "Are you sure?") }, :method => :delete %>.</p>
84 30  
85   -<p>Unhappy? <%= button_to "Cancel my account", registration_path(resource_name), :data => { :confirm => "Do you really want to cancel your account?" }, :method => :delete, class: 'btn btn-danger' %></p>
  31 +<%= link_to t('devise.shared.links.back', :default => "Back"), :back %>
... ...
app/views/devise/registrations/new.html.erb
  Diff comments   View file @0975a9e
1   -<div class="page-header">
2   - <h1>Sign Up</h1>
3   -</div>
  1 +<h2><%= t('.sign_up', :default => "Sign up") %></h2>
4 2  
5   -<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name),:html => { :class => "form-inline" }) do |f| %>
  3 +<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %>
6 4 <%= devise_error_messages! %>
7 5  
8   - <div class="row margin-left-none">
9   - <div class="form-table col-md-9">
10   - <div class="form-row">
11   - <div class="field-container">
12   - <%= f.label :name, class: 'control-label' %><br />
13   - <%= f.text_field :name, :autofocus => true, class: 'text-field form-control' %>
14   - </div>
15   - <div class="help-container">
16   - <p>
17   - Your full name.
18   - </p>
19   - </div>
20   - </div>
  6 + <div><%= f.label :email %><br />
  7 + <%= f.email_field :email %></div>
21 8  
22   - <div class="form-row">
23   - <div class="field-container">
24   - <%= f.label :email, class: 'control-label' %><br />
25   - <%= f.email_field :email, class: 'text-field form-control' %>
26   - </div>
27   - <div class="help-container">
28   - <p>
29   - Your email is our communication channel. Make sure you have typed it correctly.
30   - </p>
31   - </div>
32   - </div>
  9 + <div><%= f.label :password %><br />
  10 + <%= f.password_field :password %></div>
33 11  
34   - <div class="form-row">
35   - <div class="field-container">
36   - <%= f.label :password, class: 'control-label' %><br />
37   - <%= f.password_field :password, class: 'text-field form-control' %>
38   - </div>
39   - <div class="help-container">
40   - <p>
41   - Your password must have at least 8 characters. Strong passwords contain numbers, symbols, upper and lowercase characters.
42   - </p>
43   - </div>
44   - </div>
  12 + <div><%= f.label :password_confirmation %><br />
  13 + <%= f.password_field :password_confirmation %></div>
45 14  
46   - <div class="form-row">
47   - <div class="field-container">
48   - <%= f.label :password_confirmation, class: 'control-label' %><br />
49   - <%= f.password_field :password_confirmation, class: 'text-field form-control' %>
50   - </div>
51   - <div class="help-container">
52   - <p>
53   - Confirm your password.
54   - </p>
55   - </div>
56   - </div>
57   - </div>
58   -
59   - </div> <!--row-->
60   -
61   - <div class="row margin-left-none" style="margin-top: 20px">
62   - <%= f.submit "Sign Up", class: 'btn btn-primary col-md-2' %>
63   - </div>
  15 + <div><%= f.submit t('.sign_up', :default => "Sign up") %></div>
64 16 <% end %>
  17 +
  18 +<%= render "devise/shared/links" %>
... ...
app/views/devise/sessions/new.html.erb
  Diff comments   View file @0975a9e
1   -<div class="page-header">
2   - <h1>Login into Mezuro</h1>
3   -</div>
  1 +<h2><%= t('.sign_in', :default => "Sign in") %></h2>
4 2  
5   -<%= form_for(resource, :as => resource_name, :url => session_path(resource_name),:html => { :class => "form-inline" }) do |f| %>
6   - <div class="row margin-left-none">
7   - <div class="form-table col-md-9">
8   - <div class="form-row">
9   - <div class="field-container">
10   - <%= f.label :email, class: "control-label " %>
11   - <%= f.email_field :email, autofocus: true, tabindex: 1, class: 'text-field form-control' %>
12   - </div>
13   - <div class="help-container">
14   - <p>
15   - The same email address used to sign up.
16   - </p>
17   - </div>
18   - </div>
19   - </div>
20   - </div>
  3 +<%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
  4 + <div><%= f.label :email %><br />
  5 + <%= f.email_field :email %></div>
21 6  
22   - <div class="row margin-left-none">
23   - <div class="form-table col-md-9">
24   - <div class="form-row">
25   - <div class="field-container">
26   - <%= f.label :password, class: "control-label" %>
27   - <%= f.password_field :password, tabindex: 2, class: 'text-field form-control' %>
28   - </div>
29   - <div class="help-container">
30   - <p>
31   - If you forgot your password, follow this <a href="/users/password/new">link</a> to reset it.
32   - </p>
33   - </div>
34   - </div>
35   - </div>
36   - </div>
  7 + <div><%= f.label :password %><br />
  8 + <%= f.password_field :password %></div>
37 9  
38 10 <% if devise_mapping.rememberable? -%>
39   - <div class="row margin-left-none">
40   - <div class="form-table col-md-9">
41   - <div class="form-row">
42   - <div class="field-container">
43   - <div class="checkbox">
44   - <label>
45   - <%= f.check_box :remember_me, class: "checkbox" %> <%= f.label :remember_me %>
46   - </label>
47   - </div>
48   - </div>
49   - <div class="help-container">
50   - <p>
51   - Stay logged in.
52   - </p>
53   - </div>
54   - </div>
55   - </div>
56   - </div>
  11 + <div><%= f.check_box :remember_me %> <%= f.label :remember_me %></div>
57 12 <% end -%>
58 13  
59   - <div class="row margin-left-none" style="margin-top: 20px">
60   - <%= f.submit "Sign In", class: 'btn btn-primary', :tabindex => 3 %>
61   - <%= render "devise/shared/links" %>
62   - </div>
  14 + <div><%= f.submit t('.sign_in', :default => "Sign in") %></div>
63 15 <% end %>
  16 +
  17 +<%= render "devise/shared/links" %>
... ...
app/views/devise/shared/_links.erb
  Diff comments   View file @0975a9e
1 1 <%- if controller_name != 'sessions' %>
2   - <%= link_to "Sign In", new_session_path(resource_name), class: 'btn btn-info' %>
  2 +<%= link_to t(".sign_in", :default => "Sign in"), new_session_path(resource_name) %><br />
3 3 <% end -%>
4 4  
5 5 <%- if devise_mapping.registerable? && controller_name != 'registrations' %>
6   - <%= link_to "Sign Up", new_registration_path(resource_name), class: 'btn btn-info' %>
  6 +<%= link_to t(".sign_up", :default => "Sign up"), new_registration_path(resource_name) %><br />
7 7 <% end -%>
8 8  
9   -<!-- <%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %>
10   - <%= link_to "Forgot your password?", new_password_path(resource_name), class: 'btn btn-info' %>
11   -<% end -%> -->
  9 +<%- if devise_mapping.recoverable? && controller_name != 'passwords' %>
  10 +<%= link_to t(".forgot_your_password", :default => "Forgot your password?"), new_password_path(resource_name) %><br />
  11 +<% end -%>
12 12  
13 13 <%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
14   - <%= link_to "Have you received confirmation instructions?", new_confirmation_path(resource_name), class: 'btn btn-info' %>
  14 +<%= link_to t('.didn_t_receive_confirmation_instructions', :default => "Didn't receive confirmation instructions?"), new_confirmation_path(resource_name) %><br />
15 15 <% end -%>
16 16  
17 17 <%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %>
18   - <%= link_to "Have you received unlock instructions?", new_unlock_path(resource_name), class: 'btn btn-info' %>
  18 +<%= link_to t('.didn_t_receive_unlock_instructions', :default => "Didn't receive unlock instructions?"), new_unlock_path(resource_name) %><br />
19 19 <% end -%>
20 20  
21 21 <%- if devise_mapping.omniauthable? %>
22 22 <%- resource_class.omniauth_providers.each do |provider| %>
23   - <%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider), class: 'btn btn-info' %>
  23 + <%= link_to t('.sign_in_with_provider', :provider => provider.to_s.titleize, :default => "Sign in with #{provider.to_s.titleize}"), omniauth_authorize_path(resource_name, provider) %><br />
24 24 <% end -%>
25 25 -<% end -%>
  26 +<% end -%>
26 27 \ No newline at end of file
... ...
app/views/devise/unlocks/new.html.erb
  Diff comments   View file @0975a9e
1   -<div class="page-header">
2   - <h1>Resend unlock instructions</h1>
3   -</div>
  1 +<h2><%= t('.resend_unlock_instructions', :default => "Resend unlock instructions") %></h2>
4 2  
5 3 <%= form_for(resource, :as => resource_name, :url => unlock_path(resource_name), :html => { :method => :post }) do |f| %>
6 4 <%= devise_error_messages! %>
7 5  
8 6 <div><%= f.label :email %><br />
9   - <%= f.email_field :email, :autofocus => true %></div>
  7 + <%= f.email_field :email %></div>
10 8  
11   - <div><%= f.submit "Resend unlock instructions", class: 'btn btn-primary' %></div>
  9 + <div><%= f.submit t('.resend_unlock_instructions', :default => "Resend unlock instructions") %></div>
12 10 <% end %>
13 11  
14 12 <%= render "devise/shared/links" %>
... ...
app/views/layouts/application.html.erb
  Diff comments   View file @0975a9e
... ... @@ -77,7 +77,7 @@
77 77 <span class="caret"></span>
78 78 </a>
79 79 <ul class="dropdown-menu" role="menu">
80   - <% I18n.available_locales.each do |locale| %>
  80 + <% [:en, :pt].each do |locale| %>
81 81 <li><%= link_to(locale.to_s, url_for(locale: locale), data: { no_turbolink: true }) %></li>
82 82 <% end %>
83 83 </ul>
... ...
config/locales/devise/en.yml
View file @df02384
... ... @@ -1,60 +0,0 @@
1   -# Additional translations at https://github.com/plataformatec/devise/wiki/I18n
2   -
3   -en:
4   - devise:
5   - confirmations:
6   - confirmed: "Your account was successfully confirmed. Please sign in."
7   - confirmed_and_signed_in: "Your account was successfully confirmed. You are now signed in."
8   - send_instructions: "You will receive an email with instructions about how to confirm your account in a few minutes."
9   - send_paranoid_instructions: "If your email address exists in our database, you will receive an email with instructions about how to confirm your account in a few minutes."
10   - failure:
11   - already_authenticated: "You are already signed in."
12   - inactive: "Your account is not activated yet."
13   - invalid: "Invalid email or password."
14   - invalid_token: "Invalid authentication token."
15   - locked: "Your account is locked."
16   - not_found_in_database: "Invalid email or password."
17   - timeout: "Your session expired. Please sign in again to continue."
18   - unauthenticated: "You need to sign in or sign up before continuing."
19   - unconfirmed: "You have to confirm your account before continuing."
20   - mailer:
21   - confirmation_instructions:
22   - subject: "Confirmation instructions"
23   - reset_password_instructions:
24   - subject: "Reset password instructions"
25   - unlock_instructions:
26   - subject: "Unlock Instructions"
27   - omniauth_callbacks:
28   - failure: "Could not authenticate you from %{kind} because \"%{reason}\"."
29   - success: "Successfully authenticated from %{kind} account."
30   - passwords:
31   - 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."
32   - send_instructions: "You will receive an email with instructions about how to reset your password in a few minutes."
33   - send_paranoid_instructions: "If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes."
34   - updated: "Your password was changed successfully. You are now signed in."
35   - updated_not_active: "Your password was changed successfully."
36   - registrations:
37   - destroyed: "Bye! Your account was successfully cancelled. We hope to see you again soon."
38   - signed_up: "Welcome! You have signed up successfully."
39   - signed_up_but_inactive: "You have signed up successfully. However, we could not sign you in because your account is not yet activated."
40   - signed_up_but_locked: "You have signed up successfully. However, we could not sign you in because your account is locked."
41   - signed_up_but_unconfirmed: "A message with a confirmation link has been sent to your email address. Please open the link to activate your account."
42   - update_needs_confirmation: "You updated your account successfully, but we need to verify your new email address. Please check your email and click on the confirm link to finalize confirming your new email address."
43   - updated: "You updated your account successfully."
44   - sessions:
45   - signed_in: "Signed in successfully."
46   - signed_out: "Signed out successfully."
47   - unlocks:
48   - send_instructions: "You will receive an email with instructions about how to unlock your account in a few minutes."
49   - send_paranoid_instructions: "If your account exists, you will receive an email with instructions about how to unlock it in a few minutes."
50   - unlocked: "Your account has been unlocked successfully. Please sign in to continue."
51   - errors:
52   - messages:
53   - already_confirmed: "was already confirmed, please try signing in"
54   - confirmation_period_expired: "needs to be confirmed within %{period}, please request a new one"
55   - expired: "has expired, please request a new one"
56   - not_found: "not found"
57   - not_locked: "was not locked"
58   - not_saved:
59   - one: "1 error prohibited this %{resource} from being saved:"
60   - other: "%{count} errors prohibited this %{resource} from being saved:"
config/locales/devise/pt.yml
View file @df02384
... ... @@ -1,58 +0,0 @@
1   -pt:
2   - devise:
3   - confirmations:
4   - confirmed: "Sua conta foi confirmada com sucesso. Por favor, conecte-se com sua conta."
5   - confirmed_and_signed_in: "Sua conta foi confirmada com sucesso. Você esta conectado agora."
6   - send_instructions: "Você recebera um email com instrucoes sobre como confirmar sua conta em alguns minutos."
7   - send_paranoid_instructions: "Se seu email ja existe em nossa base de dados, você recebera um email com instrucoes sobre como confirmar sua conta em alguns minutos."
8   - failure:
9   - already_authenticated: "Você ja esta conectado."
10   - inactive: "Sua conta ainda nao esta ativada."
11   - invalid: "Email ou senha invalidos."
12   - invalid_token: "Token de autenticacao invalida."
13   - locked: "Sua conta esta bloqueada."
14   - not_found_in_database: "Email ou senha invalidos."
15   - timeout: "Sua sessao expirou. Por favor, conecte-se novamente para continuar."
16   - unauthenticated: "Você precisa registrar-se ou conectar-se antes de continuar."
17   - unconfirmed: "Você precisa confirmar sua conta antes de continuar."
18   - mailer:
19   - confirmation_instructions:
20   - subject: "Instrucoes de Confirmacao"
21   - reset_password_instructions:
22   - subject: "Resetar instrucoes de senha"
23   - unlock_instructions:
24   - subject: "Instrucoes de desbloqueio"
25   - omniauth_callbacks:
26   - failure: "Nao foi possivel te autenticar de %{kind} por que \"%{reason}\"."
27   - success: "Autenticado com sucesso de conta %{kind}."
28   - passwords:
29   - no_token: "Você nao pode acessar essa pagina se ela nao veio de um email de resetar a senha, certifique-se de que utilizou a URL completa fornecida."
30   - send_instructions: "Voce recebera um email com instrucoes sobre como resetar seu password em alguns minutos."
31   - send_paranoid_instructions: "If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes."
32   - updated: "Seu password foi trocar com sucesso. Voce estar conectado agora."
33   - updated_not_active: "Seu password foi trocado com sucesso."
34   - registrations:
35   - destroyed: "Ate Logo! Sua conta foi cancelada com sucesso. Esperamos ve-lo novamente logo."
36   - signed_up: "Bem Vindo! Voce se registrou com sucesso!"
37   - signed_up_but_inactive: "Voce se registrou com sucesso. Contudo, nao conseguimos conecta-lo pois sua conta nao esta ativada ainda."
38   - signed_up_but_locked: "Voce se registrou com sucesso. Contudo, nao conseguimos conecta-lo pois sua conta esta bloqueada."
39   - signed_up_but_unconfirmed: "Uma mensagem com um link de confirmacao foi enviada para o seu endereco de email. Por favor, abra o link para ativar sua conta."
40   - update_needs_confirmation: "Voce atualizou sua conta com sucesso, mas nos precisamos verificar seu endereco de email. Por favor, cheque seu email e clique no link de confirmacao para aceitar seu novo endereco de email."
41   - updated: "Voce atualizou sua conta com sucesso."
42   - sessions:
43   - signed_in: "Conectado com sucesso."
44   - signed_out: "Desconectado com sucesso."
45   - unlocks:
46   - send_instructions: "Voce recebera um email com instrucoes sobre como desbloquear sua conta em alguns minutos."
47   - send_paranoid_instructions: "Se sua conta existe, voce recebera um email com instrucoes sobre como desbloquea-la em alguns minutos."
48   - unlocked: "Sua conta foi desbloqueada com sucesso. Por favor conecte-se para continuar."
49   - errors:
50   - messages:
51   - already_confirmed: "ja foi confirmada, por favor tente conectar-se."
52   - confirmation_period_expired: "precisa ser confirmada em %{period}, por favor, peca uma nova confirmacao."
53   - expired: "foi expirada, peca uma nova confirmacao."
54   - not_found: "nao encontrado."
55   - not_locked: "nao foi bloqueada"
56   - not_saved:
57   - one: "1 erro proibe esse %{resource} de ser salvo:"
58   - other: "%{count} erros proibem esse %{resource} de ser salvo:"
config/locales/views/devise/en.yml 0 → 100644
  Diff comments   View file @0975a9e
... ... @@ -0,0 +1,67 @@
  1 +en:
  2 + devise:
  3 + confirmations:
  4 + new:
  5 + resend_confirmation_instructions: "Resend confirmation instructions"
  6 + mailer:
  7 + confirmation_instructions:
  8 + action: "Confirm my account"
  9 + greeting: "Welcome %{recipient}!"
  10 + instruction: "You can confirm your account email through the link below:"
  11 + 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."
  17 + 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."
  22 + passwords:
  23 + new:
  24 + forgot_your_password: "Forgot your password?"
  25 + send_me_reset_password_instructions: "Send me reset password instructions"
  26 + 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"
  31 + registrations:
  32 + 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"
  41 + new:
  42 + sign_up: "Sign up"
  43 + sessions:
  44 + new:
  45 + sign_in: "Sign in"
  46 + shared:
  47 + 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"
  55 + unlocks:
  56 + 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"
... ...
config/locales/views/devise/pt.yml 0 → 100644
  Diff comments   View file @0975a9e
... ... @@ -0,0 +1,67 @@
  1 +pt:
  2 + activerecord:
  3 + attributes:
  4 + user:
  5 + current_password: Senha atual
  6 + email: Email
  7 + password: Senha
  8 + password_confirmation: Confirme sua senha
  9 + remember_me: Lembre-se de mim
  10 + models:
  11 + user: Usuário
  12 + devise:
  13 + confirmations:
  14 + new:
  15 + resend_confirmation_instructions: Reenviar instruções de confirmação
  16 + mailer:
  17 + confirmation_instructions:
  18 + action: Confirmar minha conta
  19 + greeting: Bem-vindo %{recipient}!
  20 + instruction: 'Você pode confirmar sua conta através do link abaixo:'
  21 + reset_password_instructions:
  22 + action: Redefinir minha senha
  23 + greeting: Olá %{recipient}!
  24 + instruction: Alguém fez o pedido para redefinir sua senha, e você pode fazer isso clicando no link abaixo.
  25 + instruction_2: Se você não fez este pedido, por favor ignore este e-mail.
  26 + instruction_3: Sua senha não será alterada até que você acesse o link abaixo e crie uma nova.
  27 + unlock_instructions:
  28 + action: Desbloquear minha conta
  29 + greeting: Olá %{recipient}!
  30 + instruction: 'Clique no link abaixo para desbloquear sua conta:'
  31 + message: Sua conta foi bloqueada devido ao excessivo número de tentativas acesso inválidas.
  32 + passwords:
  33 + edit:
  34 + change_my_password: Alterar minha senha
  35 + change_your_password: Alterar sua senha
  36 + confirm_new_password: Confirme sua nova senha
  37 + new_password: Nova senha
  38 + new:
  39 + forgot_your_password: Esqueceu sua senha?
  40 + send_me_reset_password_instructions: Enviar instruções para redefinição da senha
  41 + registrations:
  42 + edit:
  43 + are_you_sure: Você tem certeza?
  44 + cancel_my_account: Cancelar minha conta
  45 + currently_waiting_confirmation_for_email: 'No momento esperando por: %{email}'
  46 + leave_blank_if_you_don_t_want_to_change_it: deixe em branco caso não queira alterá-la
  47 + title: Editar %{resource}
  48 + unhappy: Não está contente
  49 + update: Atualizar
  50 + we_need_your_current_password_to_confirm_your_changes: precisamos da sua senha atual para confirmar suas mudanças
  51 + new:
  52 + sign_up: Inscrever-se
  53 + sessions:
  54 + new:
  55 + sign_in: Login
  56 + shared:
  57 + links:
  58 + back: Voltar
  59 + didn_t_receive_confirmation_instructions: Não recebeu instruções de confirmação?
  60 + didn_t_receive_unlock_instructions: Não recebeu instruções de desbloqueio?
  61 + forgot_your_password: Esqueceu sua senha?
  62 + sign_in: Login
  63 + sign_in_with_provider: Entrar com %{provider}
  64 + sign_up: Inscrever-se
  65 + unlocks:
  66 + new:
  67 + resend_unlock_instructions: Reenviar instruções de desbloqueio
... ...