diff options
| author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2011-11-27 10:53:08 +0000 |
|---|---|---|
| committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2011-11-27 10:53:08 +0000 |
| commit | b95fd6315c9b82eb65244b1a5b13bd1b69afe529 (patch) | |
| tree | eff340b2dcefccac5987dbc9c765302fbcfaa0cb /app/helpers/timelog_helper.rb | |
| parent | f680e7f8acc14257bb585ef43a0a0572bdef0bdd (diff) | |
| download | redmine-b95fd6315c9b82eb65244b1a5b13bd1b69afe529.tar.gz redmine-b95fd6315c9b82eb65244b1a5b13bd1b69afe529.zip | |
fix time entry csv last line encoding (#8549)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7947 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/helpers/timelog_helper.rb')
| -rw-r--r-- | app/helpers/timelog_helper.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/helpers/timelog_helper.rb b/app/helpers/timelog_helper.rb index ed944b282..c5559db25 100644 --- a/app/helpers/timelog_helper.rb +++ b/app/helpers/timelog_helper.rb @@ -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)) |