aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel/lib/active_model.rb
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2009-12-27 15:23:38 -0800
committerDavid Heinemeier Hansson <david@loudthinking.com>2009-12-27 15:23:38 -0800
commitebe3c8f2e473b086277e1c6a0cf1075a4068c6e0 (patch)
tree1886778075207a507357a69dd46dec77c5524f85 /activemodel/lib/active_model.rb
parent438a8c3ec798e5c1b983db8a8421f634021d4420 (diff)
parenta176263ebc53682133ccb6d5c8ad5705c7058f86 (diff)
downloadrails-ebe3c8f2e473b086277e1c6a0cf1075a4068c6e0.tar.gz
rails-ebe3c8f2e473b086277e1c6a0cf1075a4068c6e0.tar.bz2
rails-ebe3c8f2e473b086277e1c6a0cf1075a4068c6e0.zip
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'activemodel/lib/active_model.rb')
-rw-r--r--activemodel/lib/active_model.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/activemodel/lib/active_model.rb b/activemodel/lib/active_model.rb
index e0de27b96d..0e43a1b30a 100644
--- a/activemodel/lib/active_model.rb
+++ b/activemodel/lib/active_model.rb
@@ -55,4 +55,5 @@ module ActiveModel
end
end
+require 'active_support/i18n'
I18n.load_path << File.dirname(__FILE__) + '/active_model/locale/en.yml'