lib/will_paginate/railtie.rb in will_paginate-3.0.pre4 vs lib/will_paginate/railtie.rb in will_paginate-3.0.0

@@ -1,22 +1,31 @@
 require 'will_paginate'
 require 'will_paginate/collection'
+require 'will_paginate/i18n'
 
 module WillPaginate
   class Railtie < Rails::Railtie
     initializer "will_paginate" do |app|
       ActiveSupport.on_load :active_record do
-        require 'will_paginate/finders/active_record'
-        WillPaginate::Finders::ActiveRecord.enable!
+        require 'will_paginate/active_record'
       end
 
       ActiveSupport.on_load :action_controller do
-        ActionDispatch::ShowExceptions.rescue_responses['WillPaginate::InvalidPage'] = :not_found
+        WillPaginate::Railtie.setup_actioncontroller
       end
 
       ActiveSupport.on_load :action_view do
         require 'will_paginate/view_helpers/action_view'
-        include WillPaginate::ViewHelpers::ActionView
       end
+
+      self.class.add_locale_path config
+    end
+
+    def self.setup_actioncontroller
+      ActionDispatch::ShowExceptions.rescue_responses['WillPaginate::InvalidPage'] = :not_found
+    end
+
+    def self.add_locale_path(config)
+      config.i18n.railties_load_path.unshift(*WillPaginate::I18n.load_path)
     end
   end
 end