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/functional/welcome_controller_test.rb

@@ -51,7 +51,7 @@ class WelcomeControllerTest < Test::Unit::TestCase
     Setting.default_language = 'en'
     @request.env['HTTP_ACCEPT_LANGUAGE'] = 'zh-TW'
     get :index
-    assert_equal :"zh-tw", @controller.current_language
+    assert_equal :"zh-TW", @controller.current_language
   end
   
   def test_browser_language_alternate_not_valid