devise-i18n 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5478e90a0ef44722c730d2349451fbd8b706e88
-  data.tar.gz: 5be9e381ae5990f7920bb23aee2f18016e1492ae
+  metadata.gz: a89a0c24c1f3bf8a59e845f155b51283d809453e
+  data.tar.gz: d408786d64fe433285e540d5662f265e6f1f272c
 SHA512:
-  metadata.gz: e23115dca727a2132c7e78c8bbf75ec7c76f91b58603e49a731e04732093a1905bd7145bdbc23d48e0be38d4b6c1f24d7d772ee245179c709bd3bf86595434ca
-  data.tar.gz: e346d211dfa6ed2d896e2412e07fc9cab675a1e393413a1502307e99ca6aae75e9797ddaa13b830b5129f9d74d5eee5db88eaa7d3e80b79dbe66e745d3188475
+  metadata.gz: b8fa3d1ef3b0115ad4fd5a1926f481325efd3582826027f239eada99018e38831c41b830798b7903f5dfd0ee87303230c13420c70b3f79bfbed3a2199dc50113
+  data.tar.gz: af1b9e8d1d0bb2a42fcce5ec6ecfc31cadf5115e4987e41fda66db478ae14ce85fb4ad191154fbdddc5153fb432bbfa1cec8b23aa051184dc37b98cc6139983a

data/README.md

@@ -18,13 +18,14 @@ 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.
 
+NOTE: If you have the ```simple_form``` gem in your Gemfile, this command will generate the corresponding views using the simple_form form builder.
 
 ## Customizing views
 
-The `devise:views:i18n_templates` generator will copy all devise-i18n's views to your application so that you can modify the files as you wish.
+The `devise:i18n:views` generator will copy all devise-i18n's views to your application so that you can modify the files as you wish.
 
 ``` sh
-rails g devise:views:i18n_templates
+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.
 
@@ -33,10 +34,10 @@ You should only do this if you really need to, though, because doing this will m
 
 If, for whatever reason, you want to change devise-i18n's translations, you can generate the locale file into your project with 
 ``` sh
-rails g devise:views:locale it
+rails g devise:i18n:locale it
 ```
 
-which will generate `config/locales/devise.it.yml`. If you're doing this to add a missing translation or to improve an existing one, it'd be nice if you could share your suggestions with us!
+which will generate `config/locales/devise.views.it.yml`. If you're doing this to add a missing translation or to improve an existing one, it'd be nice if you could share your suggestions with us!
 
 
 ## Contributing translations to devise-i18n

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.1.0

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

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

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

@@ -1,6 +1,5 @@
 <% require 'devise/version' %>
-<p><%= t('.greeting', :recipient => @resource.email, :default => "Welcome #{@resource.email}!") %></p>
+<p><%= t('.greeting', recipient: @resource.email) %></p>
 
-<p><%= t('.instruction', :default => "You can confirm your account email through the link below:") %></p>
-<p><%= link_to t('.action', :default => "Confirm my account"),
-         confirmation_url(@resource, :confirmation_token => (Devise::VERSION.start_with?('3.') ? @token : @resource.confirmation_token)) %></p>
+<p><%= t('.instruction') %></p>
+<p><%= link_to t('.action'), confirmation_url(@resource, confirmation_token: (Devise::VERSION.start_with?('3.') ? @token : @resource.confirmation_token)) %></p>

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

@@ -1,4 +1,4 @@
 <% require 'devise/version' %>
-<p><%= t('.greeting', :recipient => @resource.email, :default => "Hello #{@resource.email}!") %></p>
+<p><%= t('.greeting', recipient: @resource.email) %></p>
 
-<p><%= t('.message', :default => "We're contacting you to notify you that your password has been changed.") %></p>
+<p><%= t('.message') %></p>

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

@@ -1,9 +1,9 @@
 <% require 'devise/version' %>
-<p><%= t('.greeting', :recipient => @resource.email, :default => "Hello #{@resource.email}!") %></p>
+<p><%= t('.greeting', recipient: @resource.email) %></p>
 
-<p><%= t('.instruction', :default => "Someone has requested a link to change your password, and you can do this through the link below.") %></p>
+<p><%= t('.instruction') %></p>
 
-<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>
+<p><%= link_to t('.action'), edit_password_url(@resource, reset_password_token: (Devise::VERSION.start_with?('3.', '4.') ? @token : @resource.reset_password_token)) %></p>
 
-<p><%= t('.instruction_2', :default => "If you didn't request this, please ignore this email.") %></p>
-<p><%= t('.instruction_3', :default => "Your password won't change until you access the link above and create a new one.") %></p>
+<p><%= t('.instruction_2') %></p>
+<p><%= t('.instruction_3') %></p>

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

@@ -1,8 +1,8 @@
 <% require 'devise/version' %>
-<p><%= t('.greeting', :recipient => @resource.email, :default => "Hello #{@resource.email}!") %></p>
+<p><%= t('.greeting', recipient: @resource.email) %></p>
 
-<p><%= t('.message', :default => "Your account has been locked due to an excessive amount of unsuccessful sign in attempts.") %></p>
+<p><%= t('.message') %></p>
 
-<p><%= t('.instruction', :default => "Click the link below to unlock your account:") %></p>
+<p><%= t('.instruction') %></p>
 
-<p><%= link_to t('.action', :default => "Unlock my account"), unlock_url(@resource, :unlock_token => (Devise::VERSION.start_with?('3.') ? @token :@resource.unlock_token)) %></p>
+<p><%= link_to t('.action'), unlock_url(@resource, unlock_token: (Devise::VERSION.start_with?('3.') ? @token :@resource.unlock_token)) %></p>

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

@@ -1,16 +1,22 @@
-<h2><%= t('.change_your_password', :default => 'Change your password') %></h2>
+<h2><%= t('.change_your_password') %></h2>
 
-<%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put }) do |f| %>
+<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f| %>
   <%= devise_error_messages! %>
   <%= f.hidden_field :reset_password_token %>
 
-  <div><%= f.label :password, t('.new_password', :default => 'New password') %><br />
-  <%= f.password_field :password %></div>
+  <div class="field">
+    <%= f.label :password, t('.new_password') %><br />
+    <%= f.password_field :password, autocomplete: "off" %>
+  </div>
 
-  <div><%= f.label :password_confirmation, t('.confirm_new_password', :default => 'Confirm new password') %><br />
-  <%= f.password_field :password_confirmation %></div>
+  <div class="field">
+    <%= f.label :password_confirmation, t('.confirm_new_password') %><br />
+    <%= f.password_field :password_confirmation, autocomplete: "off" %>
+  </div>
 
-  <div><%= f.submit t('.change_my_password', :default => 'Change my password') %></div>
+  <div class="actions">
+    <%= f.submit t('.change_my_password') %>
+  </div>
 <% end %>
 
 <%= render "devise/shared/links" %>

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

@@ -1,12 +1,16 @@
-<h2><%= t('.forgot_your_password', :default => 'Forgot your password?') %></h2>
+<h2><%= t('.forgot_your_password') %></h2>
 
-<%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post }) do |f| %>
+<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %>
   <%= devise_error_messages! %>
 
-  <div><%= f.label :email %><br />
-  <%= f.email_field :email %></div>
+  <div class="field">
+    <%= f.label :email %><br />
+    <%= f.email_field :email, autofocus: true %>
+  </div>
 
-  <div><%= f.submit t('.send_me_reset_password_instructions', :default => "Send me reset password instructions") %></div>
+  <div class="actions">
+    <%= f.submit t('.send_me_reset_password_instructions') %>
+  </div>
 <% end %>
 
 <%= render "devise/shared/links" %>

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

@@ -1,31 +1,39 @@
-<h2><%= t('.title', :resource => resource_class.model_name.human , :default => "Edit #{resource_name.to_s.humanize}") %></h2>
+<h2><%= t('.title', resource: resource_class.model_name.human) %></h2>
 
-<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f| %>
+<%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %>
   <%= devise_error_messages! %>
 
-  <div><%= f.label :email %><br />
-  <%= f.email_field :email %></div>
+  <div class="field">
+    <%= f.label :email %><br />
+    <%= f.email_field :email %>
+  </div>
 
-  <%- if devise_mapping.confirmable? && resource.pending_reconfirmation? -%>
+  <% if devise_mapping.confirmable? && resource.pending_reconfirmation? %>
     <p>
-      <%= t('.currently_waiting_confirmation_for_email', :email => resource.unconfirmed_email, :default => "Currently waiting confirmation for: %{email}") %>
+      <%= t('.currently_waiting_confirmation_for_email', email: resource.unconfirmed_email) %>
     </p>
-  <%- end -%>
+  <% end %>
 
-  <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 />
-  <%= f.password_field :password, :autocomplete => "off" %></div>
+  <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" %>
+  </div>
 
-  <div><%= f.label :password_confirmation %><br />
-  <%= f.password_field :password_confirmation %></div>
+  <div class="field">
+    <%= f.label :password_confirmation %><br />
+    <%= f.password_field :password_confirmation %>
+  </div>
 
-  <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 />
-  <%= f.password_field :current_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 %>
+  </div>
 
-  <div><%= f.submit t('.update', :default => "Update") %></div>
+  <div><%= f.submit t('.update') %></div>
 <% end %>
 
-<h3><%= t('.cancel_my_account', :default => 'Cancel my account') %></h3>
+<h3><%= t('.cancel_my_account') %></h3>
 
-<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>
+<p><%= t('.unhappy') %>? <%= link_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', :default => "Back"), :back %>
+<%= link_to t('devise.shared.links.back'), :back %>

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

@@ -1,18 +1,26 @@
-<h2><%= t('.sign_up', :default => "Sign up") %></h2>
+<h2><%= t('.sign_up') %></h2>
 
-<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %>
+<%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %>
   <%= devise_error_messages! %>
 
-  <div><%= f.label :email %><br />
-  <%= f.email_field :email %></div>
+  <div class="field">
+    <%= f.label :email %><br />
+    <%= f.email_field :email, autofocus: true %>
+  </div>
 
-  <div><%= f.label :password %><br />
-  <%= f.password_field :password %></div>
+  <div class="field">
+    <%= f.label :password %><br />
+    <%= f.password_field :password, autocomplete: "off" %>
+  </div>
 
-  <div><%= f.label :password_confirmation %><br />
-  <%= f.password_field :password_confirmation %></div>
+  <div class="field">
+    <%= f.label :password_confirmation %><br />
+    <%= f.password_field :password_confirmation, autocomplete: "off" %>
+  </div>
 
-  <div><%= f.submit t('.sign_up', :default => "Sign up") %></div>
+  <div class="actions">
+    <%= f.submit t('.sign_up') %>
+  </div>
 <% end %>
 
 <%= render "devise/shared/links" %>

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

@@ -1,17 +1,26 @@
-<h2><%= t('.sign_in', :default => "Sign in") %></h2>
+<h2><%= t('.sign_in') %></h2>
 
-<%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
-  <div><%= f.label :email %><br />
-  <%= f.email_field :email %></div>
+<%= 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  %>
+  </div>
 
-  <div><%= f.label :password %><br />
-  <%= f.password_field :password %></div>
+  <div class="field">
+    <%= f.label :password %><br />
+    <%= f.password_field :password, autocomplete: "off" %>
+  </div>
 
-  <% if devise_mapping.rememberable? -%>
-    <div><%= f.check_box :remember_me %> <%= f.label :remember_me %></div>
-  <% end -%>
+  <% if devise_mapping.rememberable? %>
+    <div class="field">
+      <%= f.check_box :remember_me %>
+      <%= f.label :remember_me %>
+    </div>
+  <% end %>
 
-  <div><%= f.submit t('.sign_in', :default => "Sign in") %></div>
+  <div class="actions">
+    <%= f.submit t('.sign_in') %>
+  </div>
 <% end %>
 
 <%= render "devise/shared/links" %>

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

@@ -1,25 +1,25 @@
 <%- if controller_name != 'sessions' %>
-<%= link_to t(".sign_in", :default => "Sign in"), new_session_path(resource_name) %><br />
+  <%= link_to t(".sign_in"), new_session_path(resource_name) %><br />
 <% end -%>
 
 <%- if devise_mapping.registerable? && controller_name != 'registrations' %>
-<%= link_to t(".sign_up", :default => "Sign up"), new_registration_path(resource_name) %><br />
+  <%= link_to t(".sign_up"), new_registration_path(resource_name) %><br />
 <% end -%>
 
 <%- if devise_mapping.recoverable? && controller_name != 'passwords' %>
-<%= link_to t(".forgot_your_password", :default => "Forgot your password?"), new_password_path(resource_name) %><br />
+  <%= link_to t(".forgot_your_password"), new_password_path(resource_name) %><br />
 <% end -%>
 
 <%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
-<%= link_to t('.didn_t_receive_confirmation_instructions', :default => "Didn't receive confirmation instructions?"), new_confirmation_path(resource_name) %><br />
+  <%= link_to t('.didn_t_receive_confirmation_instructions'), new_confirmation_path(resource_name) %><br />
 <% end -%>
 
 <%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %>
-<%= link_to t('.didn_t_receive_unlock_instructions', :default => "Didn't receive unlock instructions?"), new_unlock_path(resource_name) %><br />
+  <%= link_to t('.didn_t_receive_unlock_instructions'), new_unlock_path(resource_name) %><br />
 <% end -%>
 
 <%- if devise_mapping.omniauthable? %>
   <%- resource_class.omniauth_providers.each do |provider| %>
-  <%= 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 />
+    <%= link_to t('.sign_in_with_provider', provider: provider.to_s.titleize), omniauth_authorize_path(resource_name, provider) %><br />
   <% end -%>
 <% end -%>

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

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

data/lib/generators/devise/{views/locale → i18n}/locale_generator.rb

@@ -1,7 +1,7 @@
 module Devise
-  module Views
+  module I18n
     class LocaleGenerator < Rails::Generators::NamedBase
-      source_root File.expand_path('../../../../../../rails/locales', __FILE__)
+      source_root File.expand_path("../../../../../rails/locales", __FILE__)
       def copy_locale
         copy_file("#{name}.yml", Rails.root.join("config", "locales", "devise.views.#{name}.yml"))
       end

data/lib/generators/devise/i18n/views_generator.rb

@@ -0,0 +1,105 @@
+module Devise
+  module I18n
+    module ViewPathTemplates #:nodoc:
+      extend ActiveSupport::Concern
+
+      included do
+        argument :scope, required: false, default: nil, desc: "The scope to copy views to"
+
+        class_option :form_builder, aliases: "-b"
+        class_option :views, aliases: "-v", type: :array, desc: "Select specific view directories to generate (confirmations, passwords, registrations, sessions, unlocks, mailer)"
+
+        public_task :copy_views
+      end
+
+      def copy_views
+        if options[:views]
+          options[:views].each { |directory| view_directory(directory.to_sym) }
+        else
+          view_directory :confirmations
+          view_directory :passwords
+          view_directory :registrations
+          view_directory :sessions
+          view_directory :unlocks
+        end
+      end
+
+      protected
+
+      def view_directory(name, target_path = nil)
+        directory name.to_s, target_path || "#{default_target_path}/#{name}" do |content|
+          if scope
+            content.gsub "devise/shared/links", "#{plural_scope}/shared/links"
+          else
+            content
+          end
+        end
+      end
+
+      def default_target_path
+        @default_target_path ||= "app/views/#{plural_scope || :devise}"
+      end
+
+      def plural_scope
+        @plural_scope ||= scope.presence && scope.underscore.pluralize
+      end
+    end
+
+    class SharedViewsGenerator < Rails::Generators::Base #:nodoc:
+      include ViewPathTemplates
+      source_root File.expand_path("../../../../../app/views/devise", __FILE__)
+      desc "Copies shared Devise views to your application."
+      hide!
+
+      # Override copy_views to just copy mailer and shared.
+      def copy_views
+        view_directory :shared
+      end
+    end
+
+    class FormForGenerator < Rails::Generators::Base #:nodoc:
+      include ViewPathTemplates
+      source_root File.expand_path("../../../../../app/views/devise", __FILE__)
+      desc "Copies default Devise views to your application."
+      hide!
+    end
+
+    class SimpleFormForGenerator < Rails::Generators::Base #:nodoc:
+      include ViewPathTemplates
+      source_root File.expand_path("../../templates/simple_form_for", __FILE__)
+      desc "Copies simple form enabled views to your application."
+      hide!
+
+      def copy_views
+        options[:views].delete("mailer") if options[:views]
+        super
+      end
+    end
+
+    class MailerViewsGenerator < Rails::Generators::Base #:nodoc:
+      include ViewPathTemplates
+      source_root File.expand_path("../../../../../app/views/devise", __FILE__)
+      desc "Copies Devise mail erb views to your application."
+      hide!
+
+      def copy_views
+        if !options[:views] || options[:views].include?("mailer")
+          view_directory :mailer
+        end
+      end
+    end
+
+    class ViewsGenerator < Rails::Generators::Base
+      desc "Copies Devise views to your application."
+
+      argument :scope, required: false, default: nil, desc: "The scope to copy views to"
+
+      invoke SharedViewsGenerator
+      invoke MailerViewsGenerator
+
+      hook_for :form_builder, aliases: "-b",
+                              desc: "Form builder to be used",
+                              default: "i18n:#{defined?(SimpleForm) ? 'simple_form_for' : 'form_for'}"
+    end
+  end
+end