aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Xie <jan.h.xie@gmail.com>2012-05-22 21:50:16 +0800
committerJan Xie <jan.h.xie@gmail.com>2012-05-22 21:50:16 +0800
commita807db9d198f533cbb1a6bac27c3c211f4729cd8 (patch)
treed7581ab70a540a3db2c8adfba478f4a8c34bc780
parent3ed92c876c5cebea908f23020457bd494755f54b (diff)
downloadrails-a807db9d198f533cbb1a6bac27c3c211f4729cd8.tar.gz
rails-a807db9d198f533cbb1a6bac27c3c211f4729cd8.tar.bz2
rails-a807db9d198f533cbb1a6bac27c3c211f4729cd8.zip
refactor lazy_load_hooks load position
-rw-r--r--activesupport/lib/active_support.rb1
-rw-r--r--activesupport/lib/active_support/i18n.rb1
2 files changed, 1 insertions, 1 deletions
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