Merge branch 'master' of git@github.com:rails/rails

1 files changed, 7 insertions, 12 deletions

diff --git a/activerecord/test/cases/i18n_test.rb b/activerecord/test/cases/i18n_test.rb
index 06036733f5..ea06e377e3 100644
--- a/activerecord/test/cases/i18n_test.rb
+++ b/activerecord/test/cases/i18n_test.rb
@@ -5,42 +5,37 @@ require 'models/reply'
 class ActiveRecordI18nTests < Test::Unit::TestCase
 
   def setup
-    reset_translations
+    I18n.backend = I18n::Backend::Simple.new
   end
   
   def test_translated_model_attributes
-    I18n.store_translations 'en-US', :activerecord => {:attributes => {:topic => {:title => 'topic title attribute'} } }
+    I18n.backend.store_translations 'en-US', :activerecord => {:attributes => {:topic => {:title => 'topic title attribute'} } }
     assert_equal 'topic title attribute', Topic.human_attribute_name('title')
   end
 
   def test_translated_model_attributes_with_sti
-    I18n.store_translations 'en-US', :activerecord => {:attributes => {:reply => {:title => 'reply title attribute'} } }
+    I18n.backend.store_translations 'en-US', :activerecord => {:attributes => {:reply => {:title => 'reply title attribute'} } }
     assert_equal 'reply title attribute', Reply.human_attribute_name('title')
   end
 
   def test_translated_model_attributes_with_sti_fallback
-    I18n.store_translations 'en-US', :activerecord => {:attributes => {:topic => {:title => 'topic title attribute'} } }
+    I18n.backend.store_translations 'en-US', :activerecord => {:attributes => {:topic => {:title => 'topic title attribute'} } }
     assert_equal 'topic title attribute', Reply.human_attribute_name('title')
   end
 
   def test_translated_model_names
-    I18n.store_translations 'en-US', :activerecord => {:models => {:topic => 'topic model'} }
+    I18n.backend.store_translations 'en-US', :activerecord => {:models => {:topic => 'topic model'} }
     assert_equal 'topic model', Topic.human_name
   end
 
   def test_translated_model_names_with_sti
-    I18n.store_translations 'en-US', :activerecord => {:models => {:reply => 'reply model'} }
+    I18n.backend.store_translations 'en-US', :activerecord => {:models => {:reply => 'reply model'} }
     assert_equal 'reply model', Reply.human_name
   end
 
   def test_translated_model_names_with_sti_fallback
-    I18n.store_translations 'en-US', :activerecord => {:models => {:topic => 'topic model'} }
+    I18n.backend.store_translations 'en-US', :activerecord => {:models => {:topic => 'topic model'} }
     assert_equal 'topic model', Reply.human_name
   end
-
-  private
-    def reset_translations
-      I18n.backend = I18n::Backend::Simple.new
-    end
 end