devise-i18n 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2da76cbd6f601a76a7923c43fb8655c4a5cd66f6
-  data.tar.gz: b36fe70af8111dfba0ba8db21f97dff355a45234
+  metadata.gz: 833c00c74986723737b9eb23ecd0f13027f1919c
+  data.tar.gz: e3fd099f093abe2ae9be7dd3af6fe33931260313
 SHA512:
-  metadata.gz: b772ff93cd3d5a26f50dedac39c0057ecc3493f779dd1e3821abc9aca0d548026b296a19f3a9b3204f9d7afadf831b008400a255298d97f9842d674c3ca7e17e
-  data.tar.gz: 6155538a692aa458b210422afce1915f7f343c6b47fdd3a37b3980a345cf984a96b39393618d36c5989970c62b96bad528394e2992b0a7578cdce826513ba78e
+  metadata.gz: 9428605c2d089d1592efe9b173c5293c6963c2aeab23cfbfe1322e896e558f680afdc79465cc565e4923d66aef7a05834d3170490d37b7b1c70d5e82a66cd573
+  data.tar.gz: 72ce83f4b50eebc0ac22b4cadd873d96e3ae2c245ca45fe696fd4fdde2131cdd5590352859853986c88855fcd8d0e188b3b5e29f431984c492d70652d1608e2a

data/README.md

@@ -6,9 +6,6 @@
 
 Devise supports i18n in controllers, models, and in other areas, but it does not have support for internationalized views. devise-i18n adds this support. Devise also does not include the actual translations. devise-i18n does this too.
 
-devise-18n is for devise v2 and later. For devise v1.5, use the **[devise-1.5 branch](https://github.com/tigrish/devise-i18n/tree/devise-1.5)**.
-
-
 ## Installation
 
 Add to your Gemfile:

data/VERSION

@@ -1 +1 @@
-1.3.0
+1.4.0

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

@@ -2,4 +2,4 @@
 <p><%= t('.greeting', recipient: @resource.email) %></p>
 
 <p><%= t('.instruction') %></p>
-<p><%= link_to t('.action'), confirmation_url(@resource, :confirmation_token => resource_confirmation_token) %></p>
+<p><%= link_to t('.action'), confirmation_url(@resource, :confirmation_token => @token) %></p>

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

@@ -3,7 +3,7 @@
 
 <p><%= t('.instruction') %></p>
 
-<p><%= link_to t('.action'), edit_password_url(@resource, :reset_password_token => resource_reset_password_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

@@ -5,4 +5,4 @@
 
 <p><%= t('.instruction') %></p>
 
-<p><%= link_to t('.action'), unlock_url(@resource, :unlock_token => resource_unlock_token) %></p>
+<p><%= link_to t('.action'), unlock_url(@resource, :unlock_token => @token) %></p>

data/lib/devise-i18n.rb

@@ -1,2 +1 @@
 require 'devise-i18n/railtie' if defined?(Rails)
-require 'devise-i18n/view_helpers'

data/lib/devise-i18n/railtie.rb

@@ -14,10 +14,6 @@ module DeviseI18n
       end
     end
 
-    initializer 'devise-i18n.view_helpers' do
-      ActionView::Base.include(ViewHelpers)
-    end
-
     protected
 
     def self.add(pattern)

data/rails/locales/ja.yml

@@ -38,7 +38,7 @@ ja:
       already_authenticated: "すでにログインしています。"
       inactive: "アカウントが有効化されていません。メールに記載された手順にしたがって、アカウントを有効化してください。"
       invalid: "メールアドレスまたはパスワードが違います。"
-      last_attempt: "アカウントがロックされる前に、あと１回操作できます。"
+      last_attempt: "もう一回誤るとアカウントがロックされます。"
       locked: "アカウントは凍結されています。"
       not_found_in_database: "メールアドレスまたはパスワードが違います。"
       timeout: "セッションがタイムアウトしました。もう一度ログインしてください。"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: devise-i18n
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Christopher Dell
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-13 00:00:00.000000000 Z
+date: 2017-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -135,7 +135,6 @@ files:
 - app/views/devise/unlocks/new.html.erb
 - lib/devise-i18n.rb
 - lib/devise-i18n/railtie.rb
-- lib/devise-i18n/view_helpers.rb
 - lib/generators/devise/i18n/locale_generator.rb
 - lib/generators/devise/i18n/views_generator.rb
 - lib/generators/devise/templates/simple_form_for/confirmations/new.html.erb

data/lib/devise-i18n/view_helpers.rb

@@ -1,24 +0,0 @@
-module DeviseI18n
-  module ViewHelpers
-    def resource_confirmation_token
-      resource_token(:confirmation)
-    end
-
-    def resource_reset_password_token
-      resource_token(:reset_password)
-    end
-
-    def resource_unlock_token
-      resource_token(:unlock)
-    end
-
-    def resource_token(type)
-      if Devise::VERSION.start_with?('1.', '2.')
-        @resource.public_send("#{type}_token")
-      else
-        @token
-      end
-    end
-  end
-end
-