summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGo MAEDA <maeda@farend.jp>2018-10-11 16:14:37 +0000
committerGo MAEDA <maeda@farend.jp>2018-10-11 16:14:37 +0000
commit7be42006515fc4536bcc6d6d41279b551ec0b53c (patch)
treeec24afac1bf3db006a253dcd67f94b89fcfc060d
parent667e9124f9ba29a6be09cdef6313427488915623 (diff)
downloadredmine-7be42006515fc4536bcc6d6d41279b551ec0b53c.tar.gz
redmine-7be42006515fc4536bcc6d6d41279b551ec0b53c.zip
Fix broken tests due to r17593 (#29739).
git-svn-id: http://svn.redmine.org/redmine/trunk@17594 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--test/functional/timelog_report_test.rb2
-rw-r--r--test/unit/lib/redmine/i18n_test.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/test/functional/timelog_report_test.rb b/test/functional/timelog_report_test.rb
index 252a5909c..6d053b55d 100644
--- 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 a21c88afc..9e8cb8d90 100644
--- 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