diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2009-09-30 22:27:02 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-09-30 22:27:02 +0100 |
| commit | dd2779e1b83b4d867d47dd286ec0c919f5df12a9 (patch) | |
| tree | 6e52ea0a329c24429f4d1d41b065e082f0ed6baa /activesupport/lib/active_support.rb | |
| parent | 329b14aa8fdd291a00d17ba12c2e0ab4c3a157cc (diff) | |
| parent | 420004e030e96f2ace6e27fd622c90ee9e986677 (diff) | |
| download | rails-dd2779e1b83b4d867d47dd286ec0c919f5df12a9.tar.gz rails-dd2779e1b83b4d867d47dd286ec0c919f5df12a9.tar.bz2 rails-dd2779e1b83b4d867d47dd286ec0c919f5df12a9.zip | |
Merge commit 'mainstream/master'
Diffstat (limited to 'activesupport/lib/active_support.rb')
| -rw-r--r-- | activesupport/lib/active_support.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support.rb b/activesupport/lib/active_support.rb index 3372fb853a..0478ae4ebc 100644 --- a/activesupport/lib/active_support.rb +++ b/activesupport/lib/active_support.rb @@ -37,5 +37,5 @@ end require 'active_support/autoload' require 'active_support/vendor' -require 'active_support/vendor/i18n' +require 'i18n' I18n.load_path << "#{File.dirname(__FILE__)}/active_support/locale/en.yml" |