From 80a816c4678bf11eb407c7e73bf9651d45c2acaf Mon Sep 17 00:00:00 2001 Message-Id: <80a816c4678bf11eb407c7e73bf9651d45c2acaf.1255803936.git.raorn@altlinux.org> In-Reply-To: References: From: Alexey I. Froloff Date: Sat, 17 Oct 2009 22:21:56 +0400 Subject: [PATCH 09/11] Use pt_BR instead of zh_TW locale. zh_TW fails load test, use pt_BR for tests. Signed-off-by: Alexey I. Froloff --- test/functional/welcome_controller_test.rb | 4 ++-- test/unit/lib/redmine/i18n_test.rb | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/test/functional/welcome_controller_test.rb b/test/functional/welcome_controller_test.rb index 5fef176..78f7b8d 100644 --- a/test/functional/welcome_controller_test.rb +++ b/test/functional/welcome_controller_test.rb @@ -49,9 +49,9 @@ class WelcomeControllerTest < ActionController::TestCase def test_browser_language_alternate Setting.default_language = 'en' - @request.env['HTTP_ACCEPT_LANGUAGE'] = 'zh-TW' + @request.env['HTTP_ACCEPT_LANGUAGE'] = 'pt-BR' get :index - assert_equal :"zh-TW", @controller.current_language + assert_equal :"pt-BR", @controller.current_language end def test_browser_language_alternate_not_valid diff --git a/test/unit/lib/redmine/i18n_test.rb b/test/unit/lib/redmine/i18n_test.rb index 35401f1..fc9aff4 100644 --- a/test/unit/lib/redmine/i18n_test.rb +++ b/test/unit/lib/redmine/i18n_test.rb @@ -92,10 +92,10 @@ class Redmine::I18nTest < ActiveSupport::TestCase def test_valid_language to_test = {'fr' => :fr, 'Fr' => :fr, - 'zh' => :zh, - 'zh-tw' => :"zh-TW", - 'zh-TW' => :"zh-TW", - 'zh-ZZ' => nil } + 'pt' => :pt, + 'pt-br' => :"pt-BR", + 'pt-BR' => :"pt-BR", + 'pt-ZZ' => nil } to_test.each {|lang, expected| assert_equal expected, find_language(lang)} end -- 1.6.4.4