diff options
| author | rick <technoweenie@gmail.com> | 2008-09-20 13:00:20 -0700 |
|---|---|---|
| committer | rick <technoweenie@gmail.com> | 2008-09-20 13:00:20 -0700 |
| commit | 22e830f883af0b56de81186c184751b6398d0141 (patch) | |
| tree | 0de20fad9f3a7ce2e49d660d1243b5b02a32e290 /activerecord/lib/active_record.rb | |
| parent | 0aef9d1a2651fa0acd2adcd2de308eeb0ec8cdd2 (diff) | |
| parent | a3b7fa78bfdc33e45e39c095b67e02d50a2c7bea (diff) | |
| download | rails-22e830f883af0b56de81186c184751b6398d0141.tar.gz rails-22e830f883af0b56de81186c184751b6398d0141.tar.bz2 rails-22e830f883af0b56de81186c184751b6398d0141.zip | |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'activerecord/lib/active_record.rb')
| -rw-r--r-- | activerecord/lib/active_record.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/activerecord/lib/active_record.rb b/activerecord/lib/active_record.rb index c47ca486c8..219cd30f94 100644 --- a/activerecord/lib/active_record.rb +++ b/activerecord/lib/active_record.rb @@ -77,7 +77,5 @@ require 'active_record/connection_adapters/abstract_adapter' require 'active_record/schema_dumper' -I18n.backend.populate do - I18n.load_translations File.dirname(__FILE__) + '/active_record/locale/en-US.yml' -end - +require 'active_record/i18n_interpolation_deprecation' +I18n.load_path << File.dirname(__FILE__) + '/active_record/locale/en-US.yml' |