summaryrefslogtreecommitdiffstats
path: root/app/helpers
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2013-03-10 13:01:46 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2013-03-10 13:01:46 +0000
commit06a92fe0d0b7923da034d58cb31cd0fdc3992c13 (patch)
tree295ffa2aa9cd76434dd7d4b5373ede157ea4b05b /app/helpers
parent3126ff8388c7f2b6491d7f0965b1c81ae304725a (diff)
downloadredmine-06a92fe0d0b7923da034d58cb31cd0fdc3992c13.tar.gz
redmine-06a92fe0d0b7923da034d58cb31cd0fdc3992c13.zip
Adds label_total_time string (#13337).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11582 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/timelog_helper.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/timelog_helper.rb b/app/helpers/timelog_helper.rb
index f6bdba2ec..cf5629f52 100644
--- a/app/helpers/timelog_helper.rb
+++ b/app/helpers/timelog_helper.rb
@@ -107,14 +107,14 @@ module TimelogHelper
# Column headers
headers = report.criteria.collect {|criteria| l(report.available_criteria[criteria][:label]) }
headers += report.periods
- headers << l(:label_total)
+ headers << l(:label_total_time)
csv << headers.collect {|c| Redmine::CodesetUtil.from_utf8(
c.to_s,
l(:general_csv_encoding) ) }
# Content
report_criteria_to_csv(csv, report.available_criteria, report.columns, report.criteria, report.periods, report.hours)
# Total row
- str_total = Redmine::CodesetUtil.from_utf8(l(:label_total), l(:general_csv_encoding))
+ str_total = Redmine::CodesetUtil.from_utf8(l(:label_total_time), l(:general_csv_encoding))
row = [ str_total ] + [''] * (report.criteria.size - 1)
total = 0
report.periods.each do |period|