Merge branch 'i18n-fix'

Fixes #466
mislav · Sep 21, 2016 · a3df0ae · a3df0ae
2 parents 89c8b6c + c8361be
commit a3df0ae
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/lib/will_paginate/railtie.rb b/lib/will_paginate/railtie.rb
@@ -18,8 +18,6 @@ class Railtie < Rails::Railtie
         require 'will_paginate/view_helpers/action_view'
       end
 
-      self.class.add_locale_path config
-
       # early access to ViewHelpers.pagination_options
       require 'will_paginate/view_helpers'
     end
@@ -31,10 +29,6 @@ def self.setup_actioncontroller
       ActionController::Base.extend ControllerRescuePatch
     end
 
-    def self.add_locale_path(config)
-      config.i18n.load_path.unshift(*WillPaginate::I18n.load_path)
-    end
-
     # Extending the exception handler middleware so it properly detects
     # WillPaginate::InvalidPage regardless of it being a tag module.
     module ShowExceptionsPatch
@@ -69,3 +63,7 @@ def rescue_from(*args, &block)
     end
   end
 end
+
+ActiveSupport.on_load :i18n do
+  I18n.load_path.concat(WillPaginate::I18n.load_path)
+end