diff options
author | Sven Fuchs <svenfuchs@artweb-design.de> | 2008-08-13 09:53:25 +0200 |
---|---|---|
committer | Sven Fuchs <svenfuchs@artweb-design.de> | 2008-08-13 09:53:25 +0200 |
commit | f26380b7757666fa793c150538e8444a640d29aa (patch) | |
tree | b5a57505bd458d762751f57422852f5bff8f83ab /activesupport/lib/active_support.rb | |
parent | bfa143fd4d15544e788d25ec163f9cc57a1e2a03 (diff) | |
download | rails-f26380b7757666fa793c150538e8444a640d29aa.tar.gz rails-f26380b7757666fa793c150538e8444a640d29aa.tar.bz2 rails-f26380b7757666fa793c150538e8444a640d29aa.zip |
switch to using I18n.load_translations instead of requiring plain ruby files
Diffstat (limited to 'activesupport/lib/active_support.rb')
-rw-r--r-- | activesupport/lib/active_support.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support.rb b/activesupport/lib/active_support.rb index 51067e910e..6056067efd 100644 --- a/activesupport/lib/active_support.rb +++ b/activesupport/lib/active_support.rb @@ -58,8 +58,8 @@ require 'active_support/base64' require 'active_support/time_with_zone' -I18n.backend.populate do - require 'active_support/locale/en-US.rb' +I18n.populate do + I18n.load_translations File.dirname(__FILE__) + '/active_support/locale/en-US.rb' end Inflector = ActiveSupport::Deprecation::DeprecatedConstantProxy.new('Inflector', 'ActiveSupport::Inflector') |