diff options
| author | Joshua Peek <josh@joshpeek.com> | 2009-09-13 22:55:46 -0500 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2009-09-13 22:55:46 -0500 |
| commit | b2f0b8cbda74cc89834b2db749fb0fbe44f5d8f2 (patch) | |
| tree | 05ae73741366a390fd543b67f7080325c8d7525e /activesupport/lib/active_support.rb | |
| parent | 6f9e449830902319d3c0897e67d8ac9c89bff39d (diff) | |
| download | rails-b2f0b8cbda74cc89834b2db749fb0fbe44f5d8f2.tar.gz rails-b2f0b8cbda74cc89834b2db749fb0fbe44f5d8f2.tar.bz2 rails-b2f0b8cbda74cc89834b2db749fb0fbe44f5d8f2.zip | |
Rollback AS bundler work and improve activation of vendored dependencies
Diffstat (limited to 'activesupport/lib/active_support.rb')
| -rw-r--r-- | activesupport/lib/active_support.rb | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/activesupport/lib/active_support.rb b/activesupport/lib/active_support.rb index 4dcb6191df..3372fb853a 100644 --- a/activesupport/lib/active_support.rb +++ b/activesupport/lib/active_support.rb @@ -37,11 +37,5 @@ end require 'active_support/autoload' require 'active_support/vendor' -begin - require 'i18n' -rescue LoadError - $: << File.expand_path(File.join(File.dirname(__FILE__), 'active_support/vendor/i18n-0.1.3/lib')) - retry -end - +require 'active_support/vendor/i18n' I18n.load_path << "#{File.dirname(__FILE__)}/active_support/locale/en.yml" |