Fix broken tests due to r17593 (#29739).

git-svn-id: http://svn.redmine.org/redmine/trunk@17594 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/test/functional/timelog_report_test.rb b/test/functional/timelog_report_test.rb
index 252a5909c07355114cf2d22715f04ce65a9759d8..6d053b55d0b99ad174b974664d1ef90231aa7c6f 100644 (file)
--- a/test/functional/timelog_report_test.rb
+++ b/test/functional/timelog_report_test.rb
@@ -299,7 +299,7 @@ class TimelogReportTest < Redmine::ControllerTest
     assert_equal "#{str_big5} #{user.lastname},7.30,7.30", lines[1]
     assert_equal "#{s2},7.30,7.30", lines[2]
 
-    str_tw = "Traditional Chinese (\xe7\xb9\x81\xe9\xab\x94\xe4\xb8\xad\xe6\x96\x87)".force_encoding('UTF-8')
+    str_tw = "Chinese/Traditional (\xe7\xb9\x81\xe9\xab\x94\xe4\xb8\xad\xe6\x96\x87)".force_encoding('UTF-8')
     assert_equal str_tw, l(:general_lang_name)
     assert_equal 'Big5', l(:general_csv_encoding)
     assert_equal ',', l(:general_csv_separator)

diff --git a/test/unit/lib/redmine/i18n_test.rb b/test/unit/lib/redmine/i18n_test.rb
index a21c88afc2f5b9b7c9b187244da5376339d57292..9e8cb8d90ad2e2ed24b7610b77c6ef0a78be7a24 100644 (file)
--- a/test/unit/lib/redmine/i18n_test.rb
+++ b/test/unit/lib/redmine/i18n_test.rb
@@ -249,7 +249,7 @@ class Redmine::I18nTest < ActiveSupport::TestCase
 
   def test_traditional_chinese_locale
     set_language_if_valid 'zh-TW'
-    str_tw = "Traditional Chinese (\xe7\xb9\x81\xe9\xab\x94\xe4\xb8\xad\xe6\x96\x87)".force_encoding('UTF-8')
+    str_tw = "Chinese/Traditional (\xE7\xB9\x81\xE9\xAB\x94\xE4\xB8\xAD\xE6\x96\x87)".force_encoding('UTF-8')
     assert_equal str_tw, l(:general_lang_name)
   end