From a807db9d198f533cbb1a6bac27c3c211f4729cd8 Mon Sep 17 00:00:00 2001 From: Jan Xie Date: Tue, 22 May 2012 21:50:16 +0800 Subject: refactor lazy_load_hooks load position --- activesupport/lib/active_support.rb | 1 + activesupport/lib/active_support/i18n.rb | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/activesupport/lib/active_support.rb b/activesupport/lib/active_support.rb index 8f018dcbc6..56d6676961 100644 --- a/activesupport/lib/active_support.rb +++ b/activesupport/lib/active_support.rb @@ -25,6 +25,7 @@ require 'securerandom' require "active_support/dependencies/autoload" require "active_support/version" require "active_support/logger" +require "active_support/lazy_load_hooks" module ActiveSupport extend ActiveSupport::Autoload diff --git a/activesupport/lib/active_support/i18n.rb b/activesupport/lib/active_support/i18n.rb index 188653bd9b..27234d89e1 100644 --- a/activesupport/lib/active_support/i18n.rb +++ b/activesupport/lib/active_support/i18n.rb @@ -1,6 +1,5 @@ begin require 'i18n' - require 'active_support/lazy_load_hooks' rescue LoadError => e $stderr.puts "The i18n gem is not available. Please add it to your Gemfile and run bundle install" raise e -- cgit v1.2.3