devise-i18n 1.5.1 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81073171fabab1e696d907c582fb2f24761f78e9
-  data.tar.gz: 0fbd1307cb25a416fe90d50a2295dc0fadbe6d4c
+  metadata.gz: bcf8f369e813c51acbb6a181a1209e31bba91d00
+  data.tar.gz: c2623da891d189ba79474dd5ca52117b9c01e3b0
 SHA512:
-  metadata.gz: 8e3e28f775712f79c436d35ee42a5767ea9166430574e5e83d246447f225befee923075642b1a7ebfdd509173e081ac08cfa4bf09b980f1acba47920b400cacc
-  data.tar.gz: '0821e21b06d9bbdd21e444478b91472919cdd1968e54e2a9da1be91ff935d4a5fbdf217068d90932b8c0b0c0d430794582d253200d7165977425d7baf1d92d49'
+  metadata.gz: e9b799d21314002f9aa7bf348fee2cccc27b71c6b7ae5644259b4d3ef6e776650e1a3e225c41983285e8b9193b54d61504bf79cb249953c651f836ad3d001e47
+  data.tar.gz: 693d3dc0e5ce2188f69b312e3ad580f99d7738c325643d27be19003fd9cd31e5250e7652a96b92f3304ff4d5466b39d522e9f738ba5d519a4e1e2b8fb93da18c

data/VERSION

@@ -1 +1 @@
-1.5.1
+1.6.0

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

@@ -5,7 +5,7 @@
 
   <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,4 @@
-<% 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', 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

@@ -6,7 +6,10 @@
 
   <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: "off" %>
   </div>
 
   <div class="field">

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

@@ -5,7 +5,7 @@
 
   <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_name.to_s.humanize) %></h2>
 
 <%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %>
   <%= devise_error_messages! %>
 
   <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" %>
+    <% 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: "off" %>
   </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: "off" %>
   </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

@@ -5,11 +5,14 @@
 
   <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.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: "off" %>
   </div>
 

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

@@ -3,7 +3,7 @@
 <%= 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">
@@ -11,12 +11,12 @@
     <%= f.password_field :password, autocomplete: "off" %>
   </div>
 
-  <% if devise_mapping.rememberable? %>
+  <% if devise_mapping.rememberable? -%>
     <div class="field">
       <%= f.check_box :remember_me %>
       <%= f.label :remember_me %>
     </div>
-  <% end %>
+  <% end -%>
 
   <div class="actions">
     <%= f.submit t('.sign_in') %>

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

@@ -6,7 +6,7 @@
   <%= link_to t(".sign_up"), new_registration_path(resource_name) %><br />
 <% 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 -%>
 
@@ -20,6 +20,6 @@
 
 <%- 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 />
+    <%= link_to t('.sign_in_with_provider', provider: OmniAuth::Utils.camelize(provider)), omniauth_authorize_path(resource_name, provider) %><br />
   <% end -%>
-<% end -%>
+<% end -%>

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

@@ -5,7 +5,7 @@
 
   <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/passwords/edit.html.erb

@@ -7,7 +7,7 @@
   <%= f.full_error :reset_password_token %>
 
   <div class="form-inputs">
-    <%= f.input :password, label: t(".new_password"), required: true, autofocus: 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) %>
     <%= f.input :password_confirmation, label: t(".confirm_new_password"), required: true %>
   </div>
 

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_name.to_s.humanize) %></h2>
 
 <%= simple_form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %>
   <%= f.error_notification %>
@@ -7,9 +7,7 @@
     <%= 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 %>

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

@@ -5,7 +5,7 @@
 
   <div class="form-inputs">
     <%= f.input :email, required: true, autofocus: true %>
-    <%= f.input :password, required: true %>
+    <%= f.input :password, required: true, hint: (t('devise.shared.minimum_password_length', count: @minimum_password_length) if @minimum_password_length) %>
     <%= f.input :password_confirmation, required: true %>
   </div>
 

data/rails/locales/af.yml

@@ -50,6 +50,10 @@ af:
         greeting: Welkom %{recipient}!
         instruction: 'Jy kan jou rekening e-pos bevestig deur die onderstaande skakel:'
         subject: Bevestigingsinstruksies
+      email_changed:
+        greeting: 
+        message: 
+        subject: 
       password_change:
         greeting: Hallo %{recipient}!
         message: Ons kontak jou om jou in kennis te stel dat jou wagwoord verander is.
@@ -118,6 +122,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

data/rails/locales/ar.yml

@@ -50,6 +50,10 @@ ar:
         greeting: "مرحباً %{recipient}"
         instruction: "يُمكنك تأكيد بريدك الإلكتروني من خلال الرابط أدناه:"
         subject: "تعليمات التأكيد"
+      email_changed:
+        greeting: 
+        message: 
+        subject: 
       password_change:
         greeting: "مرحباً %{recipient}"
         message: "لقد قمنا بالاتصال بك لإخبارك أنه قد تم تغيير كلمة مرورك."
@@ -118,6 +122,7 @@ ar:
         sign_in: "تسجيل الدخول"
         sign_in_with_provider: "تسجيل الدخول باستخدام %{provider}"
         sign_up: "التسجيل"
+      minimum_password_length: 
     unlocks:
       new:
         resend_unlock_instructions: "إعادة إرسال تعليمات إلغاء القفل"

data/rails/locales/az.yml

@@ -50,6 +50,10 @@ az:
         greeting: 
         instruction: 
         subject: Hesabın təstiqlənməsi
+      email_changed:
+        greeting: 
+        message: 
+        subject: 
       password_change:
         greeting: 
         message: 
@@ -118,6 +122,7 @@ az:
         sign_in: 
         sign_in_with_provider: 
         sign_up: 
+      minimum_password_length: 
     unlocks:
       new:
         resend_unlock_instructions: 

data/rails/locales/be.yml

@@ -50,6 +50,10 @@ be:
         greeting: "Прывітанні, %{recipient} !"
         instruction: "Вы можаце актываваць свой уліковы запіс, націснуўшы спасылку знізу:"
         subject: "Інструкцыі па пацверджанні ўліковага запісу"
+      email_changed:
+        greeting: 
+        message: 
+        subject: 
       password_change:
         greeting: "Вітаны, %{recipient}!"
         message: "Мы спрабуем звязацца з вамі, каб паведаміць, што ваш пароль быў зменены."
@@ -118,6 +122,7 @@ be:
         sign_in: "Увайсці"
         sign_in_with_provider: "Увайсці з дапамогай:  %{provider}"
         sign_up: "Рэгістрацыя"
+      minimum_password_length: 
     unlocks:
       new:
         resend_unlock_instructions: "Выслаць пацверджанне зноўку"

data/rails/locales/bg.yml

@@ -50,6 +50,10 @@ bg:
         greeting: "Добре дошли, %{recipient}!"
         instruction: "Можете да потвърдите имейл адреса си чрез линка по-долу:"
         subject: "Инструкции за потвърждаване"
+      email_changed:
+        greeting: 
+        message: 
+        subject: 
       password_change:
         greeting: "Здравейте, %{recipient}!"
         message: "Пишем Ви, за да Ви уведомим, че паролата Ви беше променена."
@@ -118,6 +122,7 @@ bg:
         sign_in: "Вход"
         sign_in_with_provider: "Вход с %{provider}"
         sign_up: "Регистрация"
+      minimum_password_length: 
     unlocks:
       new:
         resend_unlock_instructions: "Повторно изпращане на инструкции за отключване"

data/rails/locales/bn.yml

@@ -50,6 +50,10 @@ bn:
         greeting: 
         instruction: 
         subject: "নিশ্চিতকরণ নির্দেশাবলী"
+      email_changed:
+        greeting: 
+        message: 
+        subject: 
       password_change:
         greeting: 
         message: 
@@ -118,6 +122,7 @@ bn:
         sign_in: 
         sign_in_with_provider: 
         sign_up: 
+      minimum_password_length: 
     unlocks:
       new:
         resend_unlock_instructions: 

data/rails/locales/bs.yml

@@ -50,6 +50,10 @@ bs:
         greeting: 
         instruction: 
         subject: Upute za potvrdu korisničkog računa
+      email_changed:
+        greeting: 
+        message: 
+        subject: 
       password_change:
         greeting: 
         message: 
@@ -118,6 +122,7 @@ bs:
         sign_in: 
         sign_in_with_provider: 
         sign_up: 
+      minimum_password_length: 
     unlocks:
       new:
         resend_unlock_instructions: 

data/rails/locales/ca.yml

@@ -50,6 +50,10 @@ ca:
         greeting: Benvingut %{recipient}!
         instruction: 'Pots confirmar el correu electrònic del teu compte a través d''aquest enllaç:'
         subject: Instruccions de confirmació
+      email_changed:
+        greeting: 
+        message: 
+        subject: 
       password_change:
         greeting: Hola, %{recipient}!
         message: Us hem contactat per notificar-vos que s'ha modificat la vostra contrasenya.
@@ -118,6 +122,7 @@ ca:
         sign_in: Iniciar sessió
         sign_in_with_provider: Iniciar sessió amb %{provider}
         sign_up: Registrar-se
+      minimum_password_length: 
     unlocks:
       new:
         resend_unlock_instructions: Reenviar instruccions de desbloqueig

data/rails/locales/cs.yml

@@ -50,6 +50,10 @@ cs:
         greeting: Vítejte, %{recipient}!
         instruction: Můžete potvrdit svůj účet pomocí odkazu níže
         subject: Instrukce k potvrzení účtu
+      email_changed:
+        greeting: 
+        message: 
+        subject: 
       password_change:
         greeting: Ahoj %{recipient}!
         message: Dáváme vám vedět, že vaše heslo bylo změněno.
@@ -118,6 +122,7 @@ cs:
         sign_in: Přihlásit
         sign_in_with_provider: Přihlásit se přes %{provider}
         sign_up: Registrovat
+      minimum_password_length: 
     unlocks:
       new:
         resend_unlock_instructions: Znovu odeslat instrukce pro odblokování

data/rails/locales/da.yml

@@ -50,6 +50,10 @@ da:
         greeting: Velkommen %{recipient}!
         instruction: 'Du kan bekræfte din email-konto igennem linket herunder:'
         subject: Bekræftelsesinstruktioner
+      email_changed:
+        greeting: 
+        message: 
+        subject: 
       password_change:
         greeting: Hej %{recipient}!
         message: 
@@ -118,6 +122,7 @@ da:
         sign_in: Log-ind
         sign_in_with_provider: Log-ind med %{provider}
         sign_up: Registrer
+      minimum_password_length: 
     unlocks:
       new:
         resend_unlock_instructions: Få tilsendt aktiverings-instruktioner