aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSven Fuchs <svenfuchs@artweb-design.de>2008-08-20 17:51:42 +0200
committerSven Fuchs <svenfuchs@artweb-design.de>2008-08-20 17:51:42 +0200
commita6a62004c93d792c230d80f8a65da0bb45cb369f (patch)
treec022a5462e8f24ee5e9d0ee9a962c50049dae61a
parente2b191681e1c8c8b4344f1fc755e48fccdd1d603 (diff)
downloadrails-a6a62004c93d792c230d80f8a65da0bb45cb369f.tar.gz
rails-a6a62004c93d792c230d80f8a65da0bb45cb369f.tar.bz2
rails-a6a62004c93d792c230d80f8a65da0bb45cb369f.zip
add human_name and value to ar validation #generate_message
-rw-r--r--activerecord/test/cases/i18n_test.rb6
-rwxr-xr-xactivesupport/lib/active_support/vendor/i18n-0.0.1/i18n.rb2
2 files changed, 4 insertions, 4 deletions
diff --git a/activerecord/test/cases/i18n_test.rb b/activerecord/test/cases/i18n_test.rb
index 3527644f0d..06036733f5 100644
--- a/activerecord/test/cases/i18n_test.rb
+++ b/activerecord/test/cases/i18n_test.rb
@@ -39,8 +39,8 @@ class ActiveRecordI18nTests < Test::Unit::TestCase
end
private
- def reset_translations
- I18n.backend.send(:class_variable_set, :@@translations, {})
- end
+ def reset_translations
+ I18n.backend = I18n::Backend::Simple.new
+ end
end
diff --git a/activesupport/lib/active_support/vendor/i18n-0.0.1/i18n.rb b/activesupport/lib/active_support/vendor/i18n-0.0.1/i18n.rb
index 145840aa36..0e2a2d7051 100755
--- a/activesupport/lib/active_support/vendor/i18n-0.0.1/i18n.rb
+++ b/activesupport/lib/active_support/vendor/i18n-0.0.1/i18n.rb
@@ -63,7 +63,7 @@ module I18n
# files which are either named *.rb and contain plain Ruby Hashes or are
# named *.yml and contain YAML data.)
def load_translations(*args)
- backend.load_translations *args
+ backend.load_translations(*args)
end
# Stores translations for the given locale in the backend.