devise-i18n 1.5.1 → 1.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 81073171fabab1e696d907c582fb2f24761f78e9
-  data.tar.gz: 0fbd1307cb25a416fe90d50a2295dc0fadbe6d4c
+SHA256:
+  metadata.gz: b1c2fef9262ab425f0be6032c1754f354caa752789f02c49b0d1d712aa7c362c
+  data.tar.gz: 728bddbbdb6e1bd4e493defb6f0b53b7409535780a84cce9d6f0dea514330f19
 SHA512:
-  metadata.gz: 8e3e28f775712f79c436d35ee42a5767ea9166430574e5e83d246447f225befee923075642b1a7ebfdd509173e081ac08cfa4bf09b980f1acba47920b400cacc
-  data.tar.gz: '0821e21b06d9bbdd21e444478b91472919cdd1968e54e2a9da1be91ff935d4a5fbdf217068d90932b8c0b0c0d430794582d253200d7165977425d7baf1d92d49'
+  metadata.gz: f2f7f3ad8686168951a928df5a0c31df647b81f457c4a7aabf66b93ac3406f8d820bbd6c86d802132a76c4ac32a21187dc7b2b08cebd10e6c140a01e238d00d1
+  data.tar.gz: c5eed45a15d6f328ffe225988ba307dceb41ab0311fd825e3ebc537bdc6c68c372977c3f104b9d5e26fc6103bef33587b0d1b40692a58ee29f525ff3b5de0d3d

data/README.md

@@ -13,9 +13,37 @@ Add to your Gemfile:
 gem 'devise-i18n'
 ```
 
-Assuming you have _not_ previously generated Devise's views into your project, that's all you need to do. If you _have_ previously done this, you will need to regenerate your views (see the next section) and then reapply whatever customizations that made you do this in the first place.
+Assuming you have _not_ previously generated Devise's views into your project, that's all you need to do. If you _have_ previously done this, you will need to regenerate your views (see "Customizing views" below) and then reapply whatever customizations that made you do this in the first place.
 
-NOTE: If you have the ```simple_form``` gem in your Gemfile, this command will generate the corresponding views using the simple_form form builder.
+## Setting your locale
+
+You will need to set a locale in your application as described in the [Rails Internationalization Guide](https://guides.rubyonrails.org/i18n.html).
+
+If you are setting the locale per request (because your application supports multiple locales), the suggested code in that guide (using `I18n.with_locale` inside an `around_action`) will not work properly with devise-i18n. Due to [a bug in warden](https://github.com/wardencommunity/warden/issues/180), some error messages will not be translated. Instead, you can set the locale in a `before_action`:
+
+```ruby
+before_action do
+  I18n.locale = :es # Or whatever logic you use to choose.
+end
+```
+
+or in middleware:
+
+```ruby
+class LocaleMiddleware
+  def initialize(app)
+    @app = app
+  end
+
+  def call(env)
+    I18n.locale = :es # Or whatever logic you use to choose.
+    status, headers, body = @app.call(env)
+  end
+end
+```
+```ruby
+config.middleware.use ::LocaleMiddleware
+```
 
 ## Customizing views
 
@@ -26,6 +54,8 @@ rails g devise:i18n:views
 ```
 You should only do this if you really need to, though, because doing this will make it so that you won't get the updated views should they change in a future version of devise-i18n. To "uncustomize" the views, just delete them, and your app will go back to grabbing devise-i18n's default views.
 
+If you have ```simple_form``` in your Gemfile, this command will generate the corresponding views using the simple_form form builder.
+
 ## Scoped views
 
 If you need to use scoped views (for example, if you have different ones for users and admins), you can include the scope in this command.
@@ -33,7 +63,7 @@ If you need to use scoped views (for example, if you have different ones for use
 rails g devise:i18n:views user
 ```
 
-You will additionally need to generate the the translations into your app per the following section and then add keys in each file for the scope you are using.
+You will additionally need to generate the translations into your app per the following section and then add keys in each file for the scope you are using.
 
 ## Customizing translations
 

data/VERSION

@@ -1 +1 @@
-1.5.1
+1.9.4

data/app/views/devise/confirmations/new.html.erb

@@ -1,11 +1,11 @@
 <h2><%= t('.resend_confirmation_instructions') %></h2>
 
 <%= form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f| %>
-  <%= devise_error_messages! %>
+  <%= render "devise/shared/error_messages", resource: resource %>
 
   <div class="field">
     <%= f.label :email %><br />
-    <%= f.email_field :email, autofocus: true, value: (resource.pending_reconfirmation? ? resource.unconfirmed_email : resource.email) %>
+    <%= f.email_field :email, autofocus: true, autocomplete: "email", value: (resource.pending_reconfirmation? ? resource.unconfirmed_email : resource.email) %>
   </div>
 
   <div class="actions">

data/app/views/devise/mailer/confirmation_instructions.html.erb

@@ -1,5 +1,5 @@
-<% require 'devise/version' %>
-<p><%= t('.greeting', recipient: @resource.email) %></p>
+<p><%= t('.greeting', recipient: @email) %></p>
 
 <p><%= t('.instruction') %></p>
-<p><%= link_to t('.action'), confirmation_url(@resource, :confirmation_token => @token) %></p>
+
+<p><%= link_to t('.action'), confirmation_url(@resource, confirmation_token: @token) %></p>

data/app/views/devise/mailer/email_changed.html.erb

@@ -0,0 +1,7 @@
+<p><%= t('.greeting', recipient: @email) %></p>
+
+<% if @resource.try(:unconfirmed_email?) %>
+  <p><%= t('.message_unconfirmed', email: @resource.unconfirmed_email) %></p>
+<% else %>
+  <p><%= t('.message', email: @resource.email) %></p>
+<% end %>

data/app/views/devise/mailer/password_change.html.erb

@@ -1,4 +1,3 @@
-<% require 'devise/version' %>
 <p><%= t('.greeting', recipient: @resource.email) %></p>
 
 <p><%= t('.message') %></p>

data/app/views/devise/mailer/reset_password_instructions.html.erb

@@ -1,9 +1,8 @@
-<% require 'devise/version' %>
 <p><%= t('.greeting', recipient: @resource.email) %></p>
 
 <p><%= t('.instruction') %></p>
 
-<p><%= link_to t('.action'), edit_password_url(@resource, :reset_password_token => @token) %></p>
+<p><%= link_to t('.action'), edit_password_url(@resource, reset_password_token: @token) %></p>
 
 <p><%= t('.instruction_2') %></p>
 <p><%= t('.instruction_3') %></p>

data/app/views/devise/mailer/unlock_instructions.html.erb

@@ -1,8 +1,7 @@
-<% require 'devise/version' %>
 <p><%= t('.greeting', recipient: @resource.email) %></p>
 
 <p><%= t('.message') %></p>
 
 <p><%= t('.instruction') %></p>
 
-<p><%= link_to t('.action'), unlock_url(@resource, :unlock_token => @token) %></p>
+<p><%= link_to t('.action'), unlock_url(@resource, unlock_token: @token) %></p>

data/app/views/devise/passwords/edit.html.erb

@@ -1,17 +1,20 @@
 <h2><%= t('.change_your_password') %></h2>
 
 <%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f| %>
-  <%= devise_error_messages! %>
+  <%= render "devise/shared/error_messages", resource: resource %>
   <%= f.hidden_field :reset_password_token %>
 
   <div class="field">
     <%= f.label :password, t('.new_password') %><br />
-    <%= f.password_field :password, autocomplete: "off" %>
+    <% if @minimum_password_length %>
+      <em><%= t('devise.shared.minimum_password_length', count: @minimum_password_length) %></em><br />
+    <% end %>
+    <%= f.password_field :password, autofocus: true, autocomplete: "new-password" %>
   </div>
 
   <div class="field">
     <%= f.label :password_confirmation, t('.confirm_new_password') %><br />
-    <%= f.password_field :password_confirmation, autocomplete: "off" %>
+    <%= f.password_field :password_confirmation, autocomplete: "new-password" %>
   </div>
 
   <div class="actions">

data/app/views/devise/passwords/new.html.erb

@@ -1,11 +1,11 @@
 <h2><%= t('.forgot_your_password') %></h2>
 
 <%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %>
-  <%= devise_error_messages! %>
+  <%= render "devise/shared/error_messages", resource: resource %>
 
   <div class="field">
     <%= f.label :email %><br />
-    <%= f.email_field :email, autofocus: true %>
+    <%= f.email_field :email, autofocus: true, autocomplete: "email" %>
   </div>
 
   <div class="actions">

data/app/views/devise/registrations/edit.html.erb

@@ -1,39 +1,43 @@
-<h2><%= t('.title', resource: resource_class.model_name.human) %></h2>
+<h2><%= t('.title', resource: resource.model_name.human) %></h2>
 
 <%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %>
-  <%= devise_error_messages! %>
+  <%= render "devise/shared/error_messages", resource: resource %>
 
   <div class="field">
     <%= f.label :email %><br />
-    <%= f.email_field :email %>
+    <%= f.email_field :email, autofocus: true, autocomplete: "email" %>
   </div>
 
   <% if devise_mapping.confirmable? && resource.pending_reconfirmation? %>
-    <p>
-      <%= t('.currently_waiting_confirmation_for_email', email: resource.unconfirmed_email) %>
-    </p>
+    <div><%= t('.currently_waiting_confirmation_for_email', email: resource.unconfirmed_email) %></div>
   <% end %>
 
   <div class="field">
     <%= f.label :password %> <i>(<%= t('.leave_blank_if_you_don_t_want_to_change_it') %>)</i><br />
-    <%= f.password_field :password, autocomplete: "off" %>
+    <%= f.password_field :password, autocomplete: "new-password" %>
+    <% if @minimum_password_length %>
+      <br />
+      <em><%= t('devise.shared.minimum_password_length', count: @minimum_password_length) %></em>
+    <% end %>
   </div>
 
   <div class="field">
     <%= f.label :password_confirmation %><br />
-    <%= f.password_field :password_confirmation %>
+    <%= f.password_field :password_confirmation, autocomplete: "new-password" %>
   </div>
 
   <div class="field">
     <%= f.label :current_password %> <i>(<%= t('.we_need_your_current_password_to_confirm_your_changes') %>)</i><br />
-    <%= f.password_field :current_password %>
+    <%= f.password_field :current_password, autocomplete: "current-password" %>
   </div>
 
-  <div><%= f.submit t('.update') %></div>
+  <div class="actions">
+    <%= f.submit t('.update') %>
+  </div>
 <% end %>
 
 <h3><%= t('.cancel_my_account') %></h3>
 
-<p><%= t('.unhappy') %> <%= link_to t('.cancel_my_account'), registration_path(resource_name), data: { confirm: t('.are_you_sure') }, method: :delete %>.</p>
+<p><%= t('.unhappy') %> <%= button_to t('.cancel_my_account'), registration_path(resource_name), data: { confirm: t('.are_you_sure') }, method: :delete %></p>
 
 <%= link_to t('devise.shared.links.back'), :back %>

data/app/views/devise/registrations/new.html.erb

@@ -1,21 +1,24 @@
 <h2><%= t('.sign_up') %></h2>
 
 <%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %>
-  <%= devise_error_messages! %>
+  <%= render "devise/shared/error_messages", resource: resource %>
 
   <div class="field">
     <%= f.label :email %><br />
-    <%= f.email_field :email, autofocus: true %>
+    <%= f.email_field :email, autofocus: true, autocomplete: "email" %>
   </div>
 
   <div class="field">
-    <%= f.label :password %><br />
-    <%= f.password_field :password, autocomplete: "off" %>
+    <%= f.label :password %>
+    <% if @minimum_password_length %>
+    <em><%= t('devise.shared.minimum_password_length', count: @minimum_password_length) %></em>
+    <% end %><br />
+    <%= f.password_field :password, autocomplete: "new-password" %>
   </div>
 
   <div class="field">
     <%= f.label :password_confirmation %><br />
-    <%= f.password_field :password_confirmation, autocomplete: "off" %>
+    <%= f.password_field :password_confirmation, autocomplete: "new-password" %>
   </div>
 
   <div class="actions">

data/app/views/devise/sessions/new.html.erb

@@ -3,12 +3,12 @@
 <%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
   <div class="field">
     <%= f.label :email %><br />
-    <%= f.email_field :email, autofocus: true  %>
+    <%= f.email_field :email, autofocus: true, autocomplete: "email" %>
   </div>
 
   <div class="field">
     <%= f.label :password %><br />
-    <%= f.password_field :password, autocomplete: "off" %>
+    <%= f.password_field :password, autocomplete: "current-password" %>
   </div>
 
   <% if devise_mapping.rememberable? %>

data/app/views/devise/shared/_error_messages.html.erb

@@ -0,0 +1,15 @@
+<% if resource.errors.any? %>
+  <div id="error_explanation">
+    <h2>
+      <%= I18n.t("errors.messages.not_saved",
+                 count: resource.errors.count,
+                 resource: resource.class.model_name.human.downcase)
+       %>
+    </h2>
+    <ul>
+      <% resource.errors.full_messages.each do |message| %>
+        <li><%= message %></li>
+      <% end %>
+    </ul>
+  </div>
+<% end %>

data/app/views/devise/shared/_links.html.erb

@@ -1,25 +1,25 @@
 <%- if controller_name != 'sessions' %>
   <%= link_to t(".sign_in"), new_session_path(resource_name) %><br />
-<% end -%>
+<% end %>
 
 <%- if devise_mapping.registerable? && controller_name != 'registrations' %>
   <%= link_to t(".sign_up"), new_registration_path(resource_name) %><br />
-<% end -%>
+<% end %>
 
-<%- if devise_mapping.recoverable? && controller_name != 'passwords' %>
+<%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %>
   <%= link_to t(".forgot_your_password"), new_password_path(resource_name) %><br />
-<% end -%>
+<% end %>
 
 <%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
   <%= link_to t('.didn_t_receive_confirmation_instructions'), new_confirmation_path(resource_name) %><br />
-<% end -%>
+<% end %>
 
 <%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %>
   <%= link_to t('.didn_t_receive_unlock_instructions'), new_unlock_path(resource_name) %><br />
-<% end -%>
+<% end %>
 
 <%- if devise_mapping.omniauthable? %>
   <%- resource_class.omniauth_providers.each do |provider| %>
-    <%= link_to t('.sign_in_with_provider', provider: provider.to_s.titleize), omniauth_authorize_path(resource_name, provider) %><br />
-  <% end -%>
-<% end -%>
+    <%= link_to t('.sign_in_with_provider', provider: OmniAuth::Utils.camelize(provider)), omniauth_authorize_path(resource_name, provider) %><br />
+  <% end %>
+<% end %>

data/app/views/devise/unlocks/new.html.erb

@@ -1,11 +1,11 @@
 <h2><%= t('.resend_unlock_instructions') %></h2>
 
 <%= form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post }) do |f| %>
-  <%= devise_error_messages! %>
+  <%= render "devise/shared/error_messages", resource: resource %>
 
   <div class="field">
     <%= f.label :email %><br />
-    <%= f.email_field :email, autofocus: true %>
+    <%= f.email_field :email, autofocus: true, autocomplete: "email" %>
   </div>
 
   <div class="actions">

data/lib/generators/devise/templates/simple_form_for/confirmations/new.html.erb

@@ -5,7 +5,11 @@
   <%= f.full_error :confirmation_token %>
 
   <div class="form-inputs">
-    <%= f.input :email, required: true, autofocus: true %>
+    <%= f.input :email,
+                required: true,
+                autofocus: true,
+                value: (resource.pending_reconfirmation? ? resource.unconfirmed_email : resource.email),
+                input_html: { autocomplete: "email" } %>
   </div>
 
   <div class="form-actions">

data/lib/generators/devise/templates/simple_form_for/passwords/edit.html.erb

@@ -7,8 +7,16 @@
   <%= f.full_error :reset_password_token %>
 
   <div class="form-inputs">
-    <%= f.input :password, label: t(".new_password"), required: true, autofocus: true %>
-    <%= f.input :password_confirmation, label: t(".confirm_new_password"), required: true %>
+    <%= f.input :password,
+                label: t(".new_password"),
+                required: true,
+                autofocus: true,
+                hint: (t('devise.shared.minimum_password_length', count: @minimum_password_length) if @minimum_password_length),
+                input_html: { autocomplete: "new-password" } %>
+    <%= f.input :password_confirmation,
+                label: t(".confirm_new_password"),
+                required: true,
+                input_html: { autocomplete: "new-password" } %>
   </div>
 
   <div class="form-actions">

data/lib/generators/devise/templates/simple_form_for/passwords/new.html.erb

@@ -4,7 +4,10 @@
   <%= f.error_notification %>
 
   <div class="form-inputs">
-    <%= f.input :email, required: true, autofocus: true %>
+    <%= f.input :email,
+                required: true,
+                autofocus: true,
+                input_html: { autocomplete: "email" } %>
   </div>
 
   <div class="form-actions">

data/lib/generators/devise/templates/simple_form_for/registrations/edit.html.erb

@@ -1,4 +1,4 @@
-<h2><%= t(".title", resource: resource_class.model_name.human) %></h2>
+<h2><%= t(".title", resource: resource.model_name.human) %></h2>
 
 <%= simple_form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %>
   <%= f.error_notification %>
@@ -7,14 +7,20 @@
     <%= f.input :email, required: true, autofocus: true %>
 
     <% if devise_mapping.confirmable? && resource.pending_reconfirmation? %>
-      <p>
-        <%= t(".currently_waiting_confirmation_for_email", email: resource.unconfirmed_email) %>
-      </p>
+      <p><%= t(".currently_waiting_confirmation_for_email", email: resource.unconfirmed_email) %></p>
     <% end %>
 
-    <%= f.input :password, autocomplete: "off", hint: t(".leave_blank_if_you_don_t_want_to_change_it"), required: false %>
-    <%= f.input :password_confirmation, required: false %>
-    <%= f.input :current_password, hint: t(".we_need_your_current_password_to_confirm_your_changes"), required: true %>
+    <%= f.input :password,
+                hint: t(".leave_blank_if_you_don_t_want_to_change_it"),
+                required: false,
+                input_html: { autocomplete: "new-password" } %>
+    <%= f.input :password_confirmation,
+                required: false,
+                input_html: { autocomplete: "new-password" } %>
+    <%= f.input :current_password,
+                hint: t(".we_need_your_current_password_to_confirm_your_changes"),
+                required: true,
+                input_html: { autocomplete: "current-password" } %>
   </div>
 
   <div class="form-actions">

data/lib/generators/devise/templates/simple_form_for/registrations/new.html.erb

@@ -4,9 +4,17 @@
   <%= f.error_notification %>
 
   <div class="form-inputs">
-    <%= f.input :email, required: true, autofocus: true %>
-    <%= f.input :password, required: true %>
-    <%= f.input :password_confirmation, required: true %>
+    <%= f.input :email,
+                required: true,
+                autofocus: true ,
+                input_html: { autocomplete: "email" }%>
+    <%= f.input :password,
+                required: true,
+                hint: (t('devise.shared.minimum_password_length', count: @minimum_password_length) if @minimum_password_length),
+                input_html: { autocomplete: "new-password" } %>
+    <%= f.input :password_confirmation,
+                required: true,
+                input_html: { autocomplete: "new-password" } %>
   </div>
 
   <div class="form-actions">

data/lib/generators/devise/templates/simple_form_for/sessions/new.html.erb

@@ -2,8 +2,13 @@
 
 <%= simple_form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
   <div class="form-inputs">
-    <%= f.input :email, required: false, autofocus: true %>
-    <%= f.input :password, required: false %>
+    <%= f.input :email,
+                required: false,
+                autofocus: true,
+                input_html: { autocomplete: "email" } %>
+    <%= f.input :password,
+                required: false,
+                input_html: { autocomplete: "current-password" } %>
     <%= f.input :remember_me, as: :boolean if devise_mapping.rememberable? %>
   </div>
 

data/lib/generators/devise/templates/simple_form_for/unlocks/new.html.erb

@@ -5,7 +5,10 @@
   <%= f.full_error :unlock_token %>
 
   <div class="form-inputs">
-    <%= f.input :email, required: true, autofocus: true %>
+    <%= f.input :email,
+                required: true,
+                autofocus: true,
+                input_html: { autocomplete: "email" } %>
   </div>
 
   <div class="form-actions">

data/rails/locales/af.yml

@@ -2,29 +2,29 @@ af:
   activerecord:
     attributes:
       user:
-        confirmation_sent_at: 
-        confirmation_token: 
-        confirmed_at: 
-        created_at: 
+        confirmation_sent_at:
+        confirmation_token:
+        confirmed_at:
+        created_at:
         current_password: Huidige wagwoord
-        current_sign_in_at: 
-        current_sign_in_ip: 
+        current_sign_in_at:
+        current_sign_in_ip:
         email: E-pos
-        encrypted_password: 
-        failed_attempts: 
-        last_sign_in_at: 
-        last_sign_in_ip: 
-        locked_at: 
+        encrypted_password:
+        failed_attempts:
+        last_sign_in_at:
+        last_sign_in_ip:
+        locked_at:
         password: Wagwoord
         password_confirmation: Wagwoord bevestiging
-        remember_created_at: 
+        remember_created_at:
         remember_me: Onthou my
-        reset_password_sent_at: 
+        reset_password_sent_at:
         reset_password_token: Herstel wagwoord egtheidsbewys
-        sign_in_count: 
-        unconfirmed_email: 
+        sign_in_count:
+        unconfirmed_email:
         unlock_token: Ontsluit egtheidsbewys
-        updated_at: 
+        updated_at:
     models:
       user: Gebruiker
   devise:
@@ -37,10 +37,10 @@ af:
     failure:
       already_authenticated: Jy is alreeds aangeteken.
       inactive: Jou rekening is nog nie geaktiveer nie.
-      invalid: 
+      invalid:
       last_attempt: Jy het nog een poging voor jou rekening gesluit sal word.
       locked: Jou rekening is gesluit.
-      not_found_in_database: 
+      not_found_in_database:
       timeout: Jou sessie het verstryk. Teken asseblief aan om voort te gaan.
       unauthenticated: Jy moet aanteken of inteken voor jy voortgaan.
       unconfirmed: Jy moet jou e-posadres bevestig voor jy voortgaan.
@@ -50,6 +50,11 @@ af:
         greeting: Welkom %{recipient}!
         instruction: 'Jy kan jou rekening e-pos bevestig deur die onderstaande skakel:'
         subject: Bevestigingsinstruksies
+      email_changed:
+        greeting:
+        message:
+        message_unconfirmed:
+        subject:
       password_change:
         greeting: Hallo %{recipient}!
         message: Ons kontak jou om jou in kennis te stel dat jou wagwoord verander is.
@@ -103,6 +108,7 @@ af:
       signed_up_but_unconfirmed: "'n Boodskap met 'n bevestigingsskakel was gestuur na jou e-posadres. Volg asseblief die skakel om jou rekening te aktiveer."
       update_needs_confirmation: Jy het jou rekening suksesvol opgedateer, maar ons moet eerst jou nuwe e-posadres verifieer. Kyk asseblief na jou e-posse en volg die bevestigingsskakel om jou nuwe e-posadres te bevestig.
       updated: Jou rekening was suksesvol opgedateer.
+      updated_but_not_signed_in:
     sessions:
       already_signed_out: Suksesvol uitgeteken.
       new:
@@ -118,6 +124,7 @@ af:
         sign_in: Teken aan
         sign_in_with_provider: Teken aan met %{provider}
         sign_up: Teken in
+      minimum_password_length:
     unlocks:
       new:
         resend_unlock_instructions: Stuur weer ontsluitingsinstruksies