diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2012-05-10 20:48:23 -0300 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2012-05-11 19:00:25 -0300 |
| commit | a00228c1a35578c4bf4d462eec977a50120288da (patch) | |
| tree | 20330d2bf593e1baa8271655f8f90272338245be /activerecord | |
| parent | abd6f4a2b14fb048c95b3211f2c9fe5f1c006bc0 (diff) | |
| download | rails-a00228c1a35578c4bf4d462eec977a50120288da.tar.gz rails-a00228c1a35578c4bf4d462eec977a50120288da.tar.bz2 rails-a00228c1a35578c4bf4d462eec977a50120288da.zip | |
Lazy load I18n
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/activerecord/lib/active_record.rb b/activerecord/lib/active_record.rb index ed26b4899f..210820062b 100644 --- a/activerecord/lib/active_record.rb +++ b/activerecord/lib/active_record.rb @@ -22,7 +22,6 @@ #++ require 'active_support' -require 'active_support/i18n' require 'active_model' require 'arel' require 'active_record_deprecated_finders' @@ -145,4 +144,6 @@ ActiveSupport.on_load(:active_record) do Arel::Table.engine = self end -I18n.load_path << File.dirname(__FILE__) + '/active_record/locale/en.yml' +ActiveSupport.on_load(:i18n) do + I18n.load_path << File.dirname(__FILE__) + '/active_record/locale/en.yml' +end |