devise-i18n-views 0.2.5 → 0.2.6

data/VERSION

@@ -1 +1 @@
-0.2.5
+0.2.6

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

@@ -6,7 +6,7 @@
   <div><%= f.label :email %><br />
   <%= f.email_field :email %></div>
 
-  <div><%= t('.resend_confirmation_instructions', :default => 'Resend confirmation instructions') %></div>
+  <div><%= f.submit t('.resend_confirmation_instructions', :default => 'Resend confirmation instructions') %></div>
 <% end %>
 
 <%= render "devise/shared/links" %>

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

@@ -1,4 +1,4 @@
-<h2><%= t('.title', :resource => resource_name.to_s.humanize , :default => 'Edit #{resource_name.to_s.humanize}') %></h2>
+<h2><%= t('.title', :resource => resource_class.model_name.human , :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! %>
@@ -15,11 +15,11 @@
   <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>
+  <div><%= f.submit t('.update', :default => "Update") %></div>
 <% end %>
 
-<h3>Cancel my account</h3>
+<h3><%= t('.cancel_my_account', :default => 'Cancel my account') %></h3>
 
-<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>
+<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>
 
 <%= link_to "Back", :back %>

data/devise-i18n-views.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "devise-i18n-views"
-  s.version = "0.2.5"
+  s.version = "0.2.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["mcasimir"]

data/lib/devise-i18n-views.rb

@@ -2,4 +2,22 @@ require 'rails'
 module DeviseI18nViews
   class Engine < ::Rails::Engine
   end
+  
+  class Railtie < ::Rails::Railtie #:nodoc:
+    initializer 'rails-i18n-views' do |app|
+      DeviseI18nViews::Railtie.instance_eval do
+        pattern = pattern_from app.config.i18n.available_locales
+
+        files = Dir[File.join(File.dirname(__FILE__), '../locales', "#{pattern}.yml")]
+        I18n.load_path.concat(files)
+      end      
+    end
+    
+    protected
+
+    def self.pattern_from(args)
+      array = Array(args || [])
+      array.blank? ? '*' : "{#{array.join ','}}"
+    end                
+  end
 end

data/lib/generators/devise/views/i18n_templates/i18n_templates_generator.rb

@@ -4,7 +4,7 @@ module Devise
       source_root File.expand_path('../../../../../../app/views', __FILE__)
       def copy_views
          directory("devise", Rails.root.join("app", "views", "devise"))
-      end    
+      end
     end
   end
 end

data/lib/generators/devise/views/locale/locale_generator.rb

@@ -4,7 +4,7 @@ module Devise
       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
   end
 end

data/locales/en.yml

@@ -38,6 +38,9 @@ en:
         leave_blank_if_you_don_t_want_to_change_it: leave blank if you dont want to change it
         title: Edit %{resource}
         we_need_your_current_password_to_confirm_your_changes: we need your current password to confirm your changes
+        update: Update
+        cancel_my_account: Cancel my account
+        unhappy: Unhappy
       new:
         sign_up: Sign up
     sessions:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: devise-i18n-views
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
   prerelease: 
 platform: ruby
 authors:
@@ -147,9 +147,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1462681026008733906
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -158,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: I18n support for devise views