diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-08-22 12:44:14 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-08-22 12:44:14 -0700 |
| commit | a6e05b18d65d07a157ee09d54167c81f3d1440f8 (patch) | |
| tree | b19158cbc1ede41fc5db61bb3877e0407457e22b /actionpack/lib/action_view.rb | |
| parent | ab33b27947864d94be667db836e0ad7497575d13 (diff) | |
| parent | aad429a46e3017fa7ca73f58428693e821be42b6 (diff) | |
| download | rails-a6e05b18d65d07a157ee09d54167c81f3d1440f8.tar.gz rails-a6e05b18d65d07a157ee09d54167c81f3d1440f8.tar.bz2 rails-a6e05b18d65d07a157ee09d54167c81f3d1440f8.zip | |
Merge commit 'sven/i18n' into i18n
Diffstat (limited to 'actionpack/lib/action_view.rb')
| -rw-r--r-- | actionpack/lib/action_view.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view.rb b/actionpack/lib/action_view.rb index dd555b3792..f13324a9d0 100644 --- a/actionpack/lib/action_view.rb +++ b/actionpack/lib/action_view.rb @@ -35,7 +35,7 @@ require 'action_view/partials' require 'action_view/template_error' I18n.backend.populate do - require 'action_view/locale/en-US.rb' + I18n.load_translations File.dirname(__FILE__) + '/action_view/locale/en-US.yml' end ActionView::Base.class_eval do |