Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #10531 from waseem/refactor_require

Require different core extensions correctly.
  • Loading branch information...
commit 9b77f66bcc137c06ccb4fb2c050f59c4910bbf65 2 parents 99610e0 + 1a4d873
@carlosantoniodasilva carlosantoniodasilva authored
Showing with 4 additions and 4 deletions.
  1. +4 −4 activesupport/lib/active_support/i18n.rb
View
8 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"
Please sign in to comment.
Something went wrong with that request. Please try again.