Merged r1473, r1476, r1477, r1478, r1481, r1482, r1484 to r1487, r1491 from trunk.

git-svn-id: http://redmine.rubyforge.org/svn/branches/0.7-stable@1528 e93f8b46-1217-0410-a6f0-8f06a7374b81
2008-06-14 11:59:59 +00:00
parent 2074f0ab41
commit 15ecbbf928
14 changed files with 116 additions and 88 deletions
@@ -46,4 +46,18 @@ class WelcomeControllerTest < Test::Unit::TestCase
    get :index
    assert_equal :fr, @controller.current_language
  end
+  
+  def test_browser_language_alternate
+    Setting.default_language = 'en'
+    @request.env['HTTP_ACCEPT_LANGUAGE'] = 'zh-TW'
+    get :index
+    assert_equal :"zh-tw", @controller.current_language
+  end
+  
+  def test_browser_language_alternate_not_valid
+    Setting.default_language = 'en'
+    @request.env['HTTP_ACCEPT_LANGUAGE'] = 'fr-CA'
+    get :index
+    assert_equal :fr, @controller.current_language
+  end
 end