Merged Rails 2.2 branch. Redmine now requires Rails 2.2.2.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2493 e93f8b46-1217-0410-a6f0-8f06a7374b81

test/unit/user_test.rb

@@ -59,7 +59,7 @@ class UserTest < Test::Unit::TestCase
     u.login = 'newuser2'
     u.password, u.password_confirmation = "password", "password"
     assert !u.save
-    assert_equal 'activerecord_error_taken', u.errors.on(:mail)
+    assert_equal I18n.translate('activerecord.errors.messages.taken'), u.errors.on(:mail)
   end
 
   def test_update