aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view.rb
diff options
context:
space:
mode:
authorwycats <wycats@gmail.com>2010-03-10 13:28:52 -0800
committerwycats <wycats@gmail.com>2010-03-10 13:28:52 -0800
commit4745b53bcda400cf2e8cb4f2c0bf068f6d13c0e5 (patch)
tree6f080f704435d22dbfee6ffd454529c12e5bb505 /actionpack/lib/action_view.rb
parent7b622786fcc5046a06989ec7a3cbf46f92e04dea (diff)
parent84f6da45a19d335be320991cab44f492f61dc5c7 (diff)
downloadrails-4745b53bcda400cf2e8cb4f2c0bf068f6d13c0e5.tar.gz
rails-4745b53bcda400cf2e8cb4f2c0bf068f6d13c0e5.tar.bz2
rails-4745b53bcda400cf2e8cb4f2c0bf068f6d13c0e5.zip
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'actionpack/lib/action_view.rb')
-rw-r--r--actionpack/lib/action_view.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/lib/action_view.rb b/actionpack/lib/action_view.rb
index 7e9ac8720c..afe6386105 100644
--- a/actionpack/lib/action_view.rb
+++ b/actionpack/lib/action_view.rb
@@ -58,6 +58,7 @@ module ActionView
autoload :TestCase, 'action_view/test_case'
end
+require 'active_support/i18n'
require 'active_support/core_ext/string/output_safety'
I18n.load_path << "#{File.dirname(__FILE__)}/action_view/locale/en.yml"