diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index 3cc1ba006..14832016e 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -702,6 +702,7 @@ one: 1 個問題 other: "%{count} 個問題" label_total: 總計 + label_total_time: 工時總計 label_permissions: 權限 label_current_status: 目前狀態 label_new_statuses_allowed: 可變更至以下狀態 @@ -1167,4 +1168,3 @@ description_date_from: 輸入起始日期 description_date_to: 輸入結束日期 text_repository_identifier_info: '僅允許使用小寫英文字母 (a-z), 阿拉伯數字, 虛線與底線。
一旦儲存之後, 代碼便無法再次被更改。' - label_total_time: 總計 diff --git a/test/functional/time_entry_reports_controller_test.rb b/test/functional/time_entry_reports_controller_test.rb index 755cdc345..b59db1186 100644 --- a/test/functional/time_entry_reports_controller_test.rb +++ b/test/functional/time_entry_reports_controller_test.rb @@ -256,8 +256,8 @@ class TimeEntryReportsControllerTest < ActionController::TestCase assert_equal 'text/csv; header=present', @response.content_type lines = @response.body.chomp.split("\n") # Headers - s1 = "\xa5\xce\xa4\xe1,2011-11-11,\xc1`\xadp" - s2 = "\xc1`\xadp" + s1 = "\xa5\xce\xa4\xe1,2011-11-11,\xa4u\xae\xc9\xc1`\xadp" + s2 = "\xa4u\xae\xc9\xc1`\xadp" if s1.respond_to?(:force_encoding) s1.force_encoding('Big5') s2.force_encoding('Big5') @@ -307,7 +307,7 @@ class TimeEntryReportsControllerTest < ActionController::TestCase assert_equal 'text/csv; header=present', @response.content_type lines = @response.body.chomp.split("\n") # Headers - s1 = "\xa5\xce\xa4\xe1,2011-11-11,\xc1`\xadp" + s1 = "\xa5\xce\xa4\xe1,2011-11-11,\xa4u\xae\xc9\xc1`\xadp" if s1.respond_to?(:force_encoding) s1.force_encoding('Big5') end