diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-05-09 05:40:26 -0700 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-05-09 05:40:26 -0700 |
| commit | 9b77f66bcc137c06ccb4fb2c050f59c4910bbf65 (patch) | |
| tree | a0161fb1621ccf7f11abc55532dd5ddb2c175bd3 /activesupport | |
| parent | 99610e0ee625dd105f891a3f76f2c07f8b434ccb (diff) | |
| parent | 1a4d8736ce7294d2ecfc46172cc8de3b4591ac23 (diff) | |
| download | rails-9b77f66bcc137c06ccb4fb2c050f59c4910bbf65.tar.gz rails-9b77f66bcc137c06ccb4fb2c050f59c4910bbf65.tar.bz2 rails-9b77f66bcc137c06ccb4fb2c050f59c4910bbf65.zip | |
Merge pull request #10531 from waseem/refactor_require
Require different core extensions correctly.
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/lib/active_support/i18n.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/activesupport/lib/active_support/i18n.rb b/activesupport/lib/active_support/i18n.rb index 22521a8e93..6cc98191d4 100644 --- a/activesupport/lib/active_support/i18n.rb +++ b/activesupport/lib/active_support/i18n.rb @@ -1,13 +1,13 @@ +require 'active_support/core_ext/hash/deep_merge' +require 'active_support/core_ext/hash/except' +require 'active_support/core_ext/hash/slice' begin - require 'active_support/core_ext/hash/deep_merge' - require 'active_support/core_ext/hash/except' - require 'active_support/core_ext/hash/slice' 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 end +require 'active_support/lazy_load_hooks' ActiveSupport.run_load_hooks(:i18n) I18n.load_path << "#{File.dirname(__FILE__)}/locale/en.yml" |