Commit 35115e79 authored by tmaruyama's avatar tmaruyama

fix time entry csv last line encoding (#8549)

git-svn-id: https://svn.redmine.org/redmine/trunk@7947 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent c7a4eec0
......@@ -153,7 +153,8 @@ module TimelogHelper
# Content
report_criteria_to_csv(csv, criterias, periods, hours)
# Total row
row = [ l(:label_total) ] + [''] * (criterias.size - 1)
str_total = Redmine::CodesetUtil.from_utf8(l(:label_total), l(:general_csv_encoding))
row = [ str_total ] + [''] * (criterias.size - 1)
total = 0
periods.each do |period|
sum = sum_hours(select_hours(hours, @columns, period.to_s))
......
......@@ -181,12 +181,15 @@ class TimeEntryReportsControllerTest < ActionController::TestCase
lines = @response.body.chomp.split("\n")
# Headers
s1 = "\xa6\xa8\xad\xfb,2011-11-11,\xc1`\xadp"
s2 = "\xc1`\xadp"
if s1.respond_to?(:force_encoding)
s1.force_encoding('Big5')
s2.force_encoding('Big5')
end
assert_equal s1, lines.first
# Total row
assert_equal "#{str_big5} #{user.lastname},7.30,7.30", lines[1]
assert_equal "#{s2},7.30,7.30", lines[2]
end
def test_csv_cannot_convert_should_be_replaced_big_5
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment