devise-i18n-views 0.1.1 → 0.2.0

data/README.md

@@ -1,25 +1,35 @@
 #  devise-i18n-views
 
-I18n support and translations to **[Devise v2.+](https://github.com/plataformatec/devise)** views.
+I18n support and translations for **[Devise v2.+](https://github.com/plataformatec/devise)** views.
 
 ## Install
 
-Add the following line in your `Gemfile`
+Add the following line to your `Gemfile`
 
 ``` rb
-  gem 'devise-i18n-views'
+gem 'devise-i18n-views'
 ```
 
-## Translation file stub 
+and run `bundle install`.
+
+Then you need to install the required translations in your `config/locales`. You can do this either manually (downloading them from [devise-i18n-views/locales](https://github.com/mcasimir/devise-i18n-views/tree/master/locales)) or through the apposite generator `devise_i18n_views:locale`, eg. 
+
+``` sh 
+rails g devise_i18n_views:locale it
+```
 
-Please refer to [config/locales/en.yml](https://github.com/mcasimir/devise-i18n-views/blob/master/config/locales/en.yml) to grab a stub for your translation
+will generate `config/locales/devise.views.it.yml`.
 
 ## Submit or edit a translation for devise-i18n-views
  
 * Fork the latest master
-* Create a translation file or edit an existing one under `config/locales`
+* Create a translation file or edit an existing one under `locales`
 * Make a pull request
 
+## Translation file stub 
+
+Please refer to [devise-i18n-views/locales/en.yml](https://github.com/mcasimir/devise-i18n-views/blob/master/locales/en.yml) to grab a stub for your translation
+
 ## Copyright
 
 Copyright (c) 2012 mcasimir. See LICENSE.txt for

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

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

@@ -1,4 +1,4 @@
-<h2><%= t('devise.views.confirmations.new.resend_confirmation_instructions', :default => 'Resend confirmation instructions') %></h2>
+<h2><%= t('.resend_confirmation_instructions', :default => 'Resend confirmation instructions') %></h2>
 
 <%= form_for(resource, :as => resource_name, :url => confirmation_path(resource_name), :html => { :method => :post }) do |f| %>
   <%= devise_error_messages! %>
@@ -6,7 +6,7 @@
   <div><%= f.label :email %><br />
   <%= f.email_field :email %></div>
 
-  <div><%= t('devise.views.confirmations.new.resend_confirmation_instructions', :default => 'Resend confirmation instructions') %></div>
+  <div><%= t('.resend_confirmation_instructions', :default => 'Resend confirmation instructions') %></div>
 <% end %>
 
 <%= render "devise/shared/links" %>

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

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

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

@@ -1,4 +1,4 @@
-<h2><%= t('devise.views.registrations.edit.title', :resource => resource_name.to_s.humanize , :default => 'Edit #{resource_name.to_s.humanize}') %></h2>
+<h2><%= t('.title', :resource => resource_name.to_s.humanize , :default => 'Edit #{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! %>
@@ -6,13 +6,13 @@
   <div><%= f.label :email %><br />
   <%= f.email_field :email %></div>
 
-  <div><%= f.label :password %> <i>(<%= t('devise.views.registrations.edit.leave_blank_if_you_don_t_want_to_change_it', :default => "leave blank if you don't want to change it") %>)</i><br />
+  <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><%= f.label :password_confirmation %><br />
   <%= f.password_field :password_confirmation %></div>
 
-  <div><%= f.label :current_password %> <i>(<%= t('devise.views.registrations.edit.we_need_your_current_password_to_confirm_your_changes', :default => 'we need your current password to confirm your changes') %>)</i><br />
+  <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><%= f.submit "Update" %></div>
@@ -20,6 +20,6 @@
 
 <h3>Cancel my account</h3>
 
-<p>Unhappy? <%= link_to t('devise.views.registrations.edit.cancel_my_account', :default => "Cancel my account"), registration_path(resource_name), :data => { :confirm => t('devise.views.registrations.edit.are_you_sure', :default => "Are you sure?") }, :method => :delete %>.</p>
+<p>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>
 
 <%= link_to "Back", :back %>

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

@@ -1,4 +1,4 @@
-<h2><%= t('devise.views.registrations.new.sign_up', :default => "Sign up") %></h2>
+<h2><%= t('.sign_up', :default => "Sign up") %></h2>
 
 <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %>
   <%= devise_error_messages! %>
@@ -12,7 +12,7 @@
   <div><%= f.label :password_confirmation %><br />
   <%= f.password_field :password_confirmation %></div>
 
-  <div><%= f.submit t('devise.views.registrations.new.sign_up', :default => "Sign up") %></div>
+  <div><%= f.submit t('.sign_up', :default => "Sign up") %></div>
 <% end %>
 
 <%= render "devise/shared/links" %>

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

@@ -1,4 +1,4 @@
-<h2><%= t('devise.views.sessions.new.sign_in', :default => "Sign in") %></h2>
+<h2><%= t('.sign_in', :default => "Sign in") %></h2>
 
 <%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
   <div><%= f.label :email %><br />
@@ -11,7 +11,7 @@
     <div><%= f.check_box :remember_me %> <%= f.label :remember_me %></div>
   <% end -%>
 
-  <div><%= f.submit t('devise.views.sessions.new.sign_in', :default => "Sign in") %></div>
+  <div><%= f.submit t('.sign_in', :default => "Sign in") %></div>
 <% end %>
 
 <%= render "devise/shared/links" %>

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

@@ -1,25 +1,25 @@
 <%- if controller_name != 'sessions' %>
-<%= link_to t("devise.views.links.sign_in", :default => "Sign in"), new_session_path(resource_name) %><br />
+<%= link_to t(".sign_in", :default => "Sign in"), new_session_path(resource_name) %><br />
 <% end -%>
 
 <%- if devise_mapping.registerable? && controller_name != 'registrations' %>
-<%= link_to t("devise.views.links.sign_up", :default => "Sign up"), new_registration_path(resource_name) %><br />
+<%= link_to t(".sign_up", :default => "Sign up"), new_registration_path(resource_name) %><br />
 <% end -%>
 
 <%- if devise_mapping.recoverable? && controller_name != 'passwords' %>
-<%= link_to t("devise.views.links.forgot_your_password", :default => "Forgot your password?"), new_password_path(resource_name) %><br />
+<%= link_to t(".forgot_your_password", :default => "Forgot your password?"), new_password_path(resource_name) %><br />
 <% end -%>
 
 <%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
-<%= link_to t('devise.views.links.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', :default => "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('devise.views.links.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', :default => "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('devise.views.links.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, :default => "Sign in with #{provider.to_s.titleize}"), omniauth_authorize_path(resource_name, provider) %><br />
   <% end -%>
 <% end -%>

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

@@ -1,4 +1,4 @@
-<h2><%= t('devise.views.unlocks.new.resend_unlock_instructions', :default => "Resend unlock instructions") %></h2>
+<h2><%= t('.resend_unlock_instructions', :default => "Resend unlock instructions") %></h2>
 
 <%= form_for(resource, :as => resource_name, :url => unlock_path(resource_name), :html => { :method => :post }) do |f| %>
   <%= devise_error_messages! %>
@@ -6,7 +6,7 @@
   <div><%= f.label :email %><br />
   <%= f.email_field :email %></div>
 
-  <div><%= f.submit t('devise.views.unlocks.new.resend_unlock_instructions', :default => "Resend unlock instructions") %></div>
+  <div><%= f.submit t('.resend_unlock_instructions', :default => "Resend unlock instructions") %></div>
 <% end %>
 
 <%= render "devise/shared/links" %>

data/devise-i18n-views.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "devise-i18n-views"
-  s.version = "0.1.1"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["mcasimir"]
@@ -36,10 +36,11 @@ Gem::Specification.new do |s|
     "app/views/devise/sessions/new.html.erb",
     "app/views/devise/shared/_links.erb",
     "app/views/devise/unlocks/new.html.erb",
-    "config/locales/en.yml",
-    "config/locales/it.yml",
     "devise-i18n-views.gemspec",
-    "lib/devise-i18n-views.rb"
+    "lib/devise-i18n-views.rb",
+    "lib/generators/devise_i18n_views/locale/locale_generator.rb",
+    "locales/en.yml",
+    "locales/it.yml"
   ]
   s.homepage = "http://github.com/mcasimir/devise-i18n-views"
   s.licenses = ["MIT"]

data/lib/generators/devise_i18n_views/locale/locale_generator.rb

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

data/{config/locales → locales}/en.yml

@@ -19,26 +19,26 @@ en:
         message: "Your account has been locked due to an excessive amount of unsuccessful sign in attempts."
         instruction: "Click the link below to unlock your account:"
         action: "Unlock my account"
-    views:
-      confirmations:
-        new:
-          resend_confirmation_instructions: "Resend confirmation instructions"
-      passwords:
-        new:
-          forgot_your_password: "Forgot your password?"
-          send_me_reset_password_instructions: "Send me reset password instructions"
-      registrations:
-        edit:
-          title: "Edit %{resource}"
-          leave_blank_if_you_don_t_want_to_change_it: "leave blank if you dont want to change it"
-          we_need_your_current_password_to_confirm_your_changes: "we need your current password to confirm your changes"
-          cancel_my_account: "Cancel my account"
-          are_you_sure: "Are you sure?"
-        new:
-          sign_up: "Sign up"
-      sessions:
-        new:
-          sign_in: "Sign in"
+    confirmations:
+      new:
+        resend_confirmation_instructions: "Resend confirmation instructions"
+    passwords:
+      new:
+        forgot_your_password: "Forgot your password?"
+        send_me_reset_password_instructions: "Send me reset password instructions"
+    registrations:
+      edit:
+        title: "Edit %{resource}"
+        leave_blank_if_you_don_t_want_to_change_it: "leave blank if you dont want to change it"
+        we_need_your_current_password_to_confirm_your_changes: "we need your current password to confirm your changes"
+        cancel_my_account: "Cancel my account"
+        are_you_sure: "Are you sure?"
+      new:
+        sign_up: "Sign up"
+    sessions:
+      new:
+        sign_in: "Sign in"
+    shared:
       links:
         didn_t_receive_confirmation_instructions: "Didn't receive confirmation instructions?"
         didn_t_receive_unlock_instructions: "Didn't receive unlock instructions?"
@@ -46,6 +46,6 @@ en:
         sign_in: "Sign in"
         sign_up: "Sign up"
         sign_in_with_provider: "Sign in with %{provider}"
-      unlocks:
-        new:
-          resend_unlock_instructions: "Resend unlock instructions"
+    unlocks:
+      new:
+        resend_unlock_instructions: "Resend unlock instructions"

data/{config/locales → locales}/it.yml

@@ -19,26 +19,26 @@ it:
         message: 'Il tuo account è stato bloccato a seguito di un numero eccessivo di tentativi di accesso falliti.'
         instruction: 'Clicca sul link qui sotto per sbloccare il tuo account:'
         action: "Sblocca il mio account"
-    views:
-      confirmations:
-        new:
-          resend_confirmation_instructions: "Invia di nuovo le istruzioni per la conferma"
-      passwords:
-        new:
-          forgot_your_password: "Password dimenticata?"
-          send_me_reset_password_instructions: "Inviami le istruzioni per resettare la password"
-      registrations:
-        edit:
-          title: "Modifica %{resource}"
-          leave_blank_if_you_don_t_want_to_change_it: "lascia in bianco se non vuoi cambiarla"
-          we_need_your_current_password_to_confirm_your_changes: "abbiamo bisogno della tua password attuale per confermare i cambiamenti"
-          cancel_my_account: "Rimuovi il mio account"
-          are_you_sure: "Sei sicuro?"
-        new:
-          sign_up: "Registrati"
-      sessions:
-        new:
-          sign_in: "Accedi"
+    confirmations:
+      new:
+        resend_confirmation_instructions: "Invia di nuovo le istruzioni per la conferma"
+    passwords:
+      new:
+        forgot_your_password: "Password dimenticata?"
+        send_me_reset_password_instructions: "Inviami le istruzioni per resettare la password"
+    registrations:
+      edit:
+        title: "Modifica %{resource}"
+        leave_blank_if_you_don_t_want_to_change_it: "lascia in bianco se non vuoi cambiarla"
+        we_need_your_current_password_to_confirm_your_changes: "abbiamo bisogno della tua password attuale per confermare i cambiamenti"
+        cancel_my_account: "Rimuovi il mio account"
+        are_you_sure: "Sei sicuro?"
+      new:
+        sign_up: "Registrati"
+    sessions:
+      new:
+        sign_in: "Accedi"
+    shared:
       links:
         forgot_your_password: "Password dimenticata?"
         sign_up: "Registrati"
@@ -46,7 +46,7 @@ it:
         sign_in_with_provider: "Accedi con %{provider}"        
         didn_t_receive_confirmation_instructions: "Non hai ricevuto le istruzioni per la conferma?"
         didn_t_receive_unlock_instructions: "Non hai ricevuto le istruzioni per lo sblocco?"
-      unlocks:
-        new:
-          resend_unlock_instructions: "Invia di nuovo le istruzioni per lo sblocco"
+    unlocks:
+      new:
+        resend_unlock_instructions: "Invia di nuovo le istruzioni per lo sblocco"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: devise-i18n-views
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -70,10 +70,11 @@ files:
 - app/views/devise/sessions/new.html.erb
 - app/views/devise/shared/_links.erb
 - app/views/devise/unlocks/new.html.erb
-- config/locales/en.yml
-- config/locales/it.yml
 - devise-i18n-views.gemspec
 - lib/devise-i18n-views.rb
+- lib/generators/devise_i18n_views/locale/locale_generator.rb
+- locales/en.yml
+- locales/it.yml
 homepage: http://github.com/mcasimir/devise-i18n-views
 licenses:
 - MIT
@@ -89,7 +90,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1097205621276434082
+      hash: -1969737330795035709
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: