diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-08-27 12:31:07 -0700 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-08-27 12:31:07 -0700 |
commit | 657898c821b3877ad25ee4f9764e169ce554e884 (patch) | |
tree | 3581697ddbf50b2849c2395bba43de6ce110ad13 /activerecord/lib | |
parent | 87fafe40748311adfb48940944e05230f01d0dee (diff) | |
parent | cba83ede5de1b2630e244d46536439673f328900 (diff) | |
download | rails-657898c821b3877ad25ee4f9764e169ce554e884.tar.gz rails-657898c821b3877ad25ee4f9764e169ce554e884.tar.bz2 rails-657898c821b3877ad25ee4f9764e169ce554e884.zip |
Merge commit 'sven/i18n'
Conflicts:
activesupport/lib/active_support.rb
Diffstat (limited to 'activerecord/lib')
-rw-r--r-- | activerecord/lib/active_record.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/activerecord/lib/active_record.rb b/activerecord/lib/active_record.rb index c47ca486c8..a6bbd6fc82 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 +I18n.load_translations File.dirname(__FILE__) + '/active_record/locale/en-US.yml' |