diff --git a/app/helpers/timelog_helper.rb b/app/helpers/timelog_helper.rb
index f6bdba2..cf5629f 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|
diff --git a/app/views/my/blocks/_timelog.html.erb b/app/views/my/blocks/_timelog.html.erb
index 0e0e614..be8e05e 100644
--- a/app/views/my/blocks/_timelog.html.erb
+++ b/app/views/my/blocks/_timelog.html.erb
@@ -5,7 +5,7 @@ entries_by_day = entries.group_by(&:spent_on)
%>
-
<%= l(:label_total) %>: <%= html_hours("%.2f" % entries.sum(&:hours).to_f) %>
+
<%= l(:label_total_time) %>: <%= html_hours("%.2f" % entries.sum(&:hours).to_f) %>
<% if entries.any? %>
diff --git a/app/views/timelog/index.html.erb b/app/views/timelog/index.html.erb
index e1fa5b2..35ddf81 100644
--- a/app/views/timelog/index.html.erb
+++ b/app/views/timelog/index.html.erb
@@ -13,7 +13,7 @@
<% end %>
-
<%= l(:label_total) %>: <%= html_hours(l_hours(@total_hours)) %>
+
<%= l(:label_total_time) %>: <%= html_hours(l_hours(@total_hours)) %>
<% unless @entries.empty? %>
diff --git a/app/views/timelog/report.html.erb b/app/views/timelog/report.html.erb
index 4b9f0be..d88ee78 100644
--- a/app/views/timelog/report.html.erb
+++ b/app/views/timelog/report.html.erb
@@ -30,7 +30,7 @@
<% unless @report.criteria.empty? %>
-
<%= l(:label_total) %>: <%= html_hours(l_hours(@report.total_hours)) %>
+
<%= l(:label_total_time) %>: <%= html_hours(l_hours(@report.total_hours)) %>
<% unless @report.hours.empty? %>
@@ -45,13 +45,13 @@
<% @report.periods.each do |period| %>
<%= period %> |
<% end %>
- <%= l(:label_total) %> |
+ <%= l(:label_total_time) %> |
<%= render :partial => 'report_criteria', :locals => {:criterias => @report.criteria, :hours => @report.hours, :level => 0} %>
- <%= l(:label_total) %> |
+ <%= l(:label_total_time) %> |
<%= (' | ' * (@report.criteria.size - 1)).html_safe %>
<% total = 0 -%>
<% @report.periods.each do |period| -%>
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index b7a3cc7..ac99bd6 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -1087,3 +1087,4 @@ ar:
field_closed_on: Closed
field_generate_password: Generate password
setting_default_projects_tracker_ids: Default trackers for new projects
+ label_total_time: الإجمالي
diff --git a/config/locales/az.yml b/config/locales/az.yml
index 69de2b9..5e4d828 100644
--- a/config/locales/az.yml
+++ b/config/locales/az.yml
@@ -1184,3 +1184,4 @@ az:
field_closed_on: Closed
field_generate_password: Generate password
setting_default_projects_tracker_ids: Default trackers for new projects
+ label_total_time: Cəmi
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 35cb43b..35d9032 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -1084,3 +1084,4 @@ bg:
description_date_from: Въведете начална дата
description_date_to: Въведете крайна дата
text_repository_identifier_info: 'Позволени са малки букви (a-z), цифри, тирета и _.
Промяна след създаването му не е възможна.'
+ label_total_time: Общо
diff --git a/config/locales/bs.yml b/config/locales/bs.yml
index ab81191..8f5d8f6 100644
--- a/config/locales/bs.yml
+++ b/config/locales/bs.yml
@@ -1100,3 +1100,4 @@ bs:
field_closed_on: Closed
field_generate_password: Generate password
setting_default_projects_tracker_ids: Default trackers for new projects
+ label_total_time: Ukupno
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 93219ad..de648a1 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -1089,3 +1089,4 @@ ca:
field_closed_on: Closed
field_generate_password: Generate password
setting_default_projects_tracker_ids: Default trackers for new projects
+ label_total_time: Total
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 52c5faf..5c20f7c 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -1091,3 +1091,4 @@ cs:
field_closed_on: Uzavřeno
field_generate_password: Generovat heslo
setting_default_projects_tracker_ids: Default trackers for new projects
+ label_total_time: Celkem
diff --git a/config/locales/da.yml b/config/locales/da.yml
index 606e289..17b7ffb 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -1104,3 +1104,4 @@ da:
field_closed_on: Closed
field_generate_password: Generate password
setting_default_projects_tracker_ids: Default trackers for new projects
+ label_total_time: Total
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 2ec1262..96f86ce 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -1099,4 +1099,4 @@ de:
version_status_open: offen
warning_attachments_not_saved: "%{count} Datei(en) konnten nicht gespeichert werden."
-
+ label_total_time: Gesamtzeit
diff --git a/config/locales/el.yml b/config/locales/el.yml
index 2235a29..e4df4ff 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -1087,3 +1087,4 @@ el:
field_closed_on: Closed
field_generate_password: Generate password
setting_default_projects_tracker_ids: Default trackers for new projects
+ label_total_time: Σύνολο
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index a06e7fc..9e392d6 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -1089,3 +1089,4 @@ en-GB:
field_closed_on: Closed
field_generate_password: Generate password
setting_default_projects_tracker_ids: Default trackers for new projects
+ label_total_time: Total
diff --git a/config/locales/en.yml b/config/locales/en.yml
index d2da3d2..bc997b4 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -619,6 +619,7 @@ en:
one: 1 issue
other: "%{count} issues"
label_total: Total
+ label_total_time: Total time
label_permissions: Permissions
label_current_status: Current status
label_new_statuses_allowed: New statuses allowed
diff --git a/config/locales/es.yml b/config/locales/es.yml
index d051edd..d8262b0 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -1123,3 +1123,4 @@ es:
field_closed_on: Closed
field_generate_password: Generate password
setting_default_projects_tracker_ids: Default trackers for new projects
+ label_total_time: Total
diff --git a/config/locales/et.yml b/config/locales/et.yml
index b52ff1d..c7ea6ad 100644
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -1100,3 +1100,4 @@ et:
field_closed_on: Closed
field_generate_password: Generate password
setting_default_projects_tracker_ids: Default trackers for new projects
+ label_total_time: "Kokku"
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index cc96dba..6f94d0b 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -1088,3 +1088,4 @@ eu:
field_closed_on: Closed
field_generate_password: Generate password
setting_default_projects_tracker_ids: Default trackers for new projects
+ label_total_time: Guztira
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index a7b7050..3d2cc9a 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -1089,3 +1089,4 @@ fa:
field_closed_on: Closed
field_generate_password: Generate password
setting_default_projects_tracker_ids: Default trackers for new projects
+ label_total_time: جمله
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 4f393f8..8fb5693 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -1108,3 +1108,4 @@ fi:
field_closed_on: Closed
field_generate_password: Generate password
setting_default_projects_tracker_ids: Default trackers for new projects
+ label_total_time: Yhteensä
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 6aba859..492f26a 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -613,6 +613,7 @@ fr:
one: 1 demande
other: "%{count} demandes"
label_total: Total
+ label_total_time: Temps total
label_permissions: Permissions
label_current_status: Statut actuel
label_new_statuses_allowed: Nouveaux statuts autorisés
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 6333fe3..6ef9b71 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -1098,3 +1098,4 @@ gl:
field_closed_on: Closed
field_generate_password: Generate password
setting_default_projects_tracker_ids: Default trackers for new projects
+ label_total_time: Total
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 0c3a676..01b3b19 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -1092,3 +1092,4 @@ he:
field_closed_on: Closed
field_generate_password: Generate password
setting_default_projects_tracker_ids: Default trackers for new projects
+ label_total_time: סה"כ
diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index c3a22fb..4a35973 100644
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -1088,3 +1088,4 @@ hr:
field_closed_on: Closed
field_generate_password: Generate password
setting_default_projects_tracker_ids: Default trackers for new projects
+ label_total_time: Ukupno
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index abbe5c8..319dc66 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -1106,3 +1106,4 @@
field_closed_on: Closed
field_generate_password: Generate password
setting_default_projects_tracker_ids: Default trackers for new projects
+ label_total_time: Összesen
diff --git a/config/locales/id.yml b/config/locales/id.yml
index 7ceaf77..2baded4 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -1091,3 +1091,4 @@ id:
field_closed_on: Closed
field_generate_password: Generate password
setting_default_projects_tracker_ids: Default trackers for new projects
+ label_total_time: Total
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 124efd7..1363ea0 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -1088,3 +1088,4 @@ it:
field_closed_on: Closed
field_generate_password: Generate password
setting_default_projects_tracker_ids: Default trackers for new projects
+ label_total_time: Totale
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 7b3a2a0..1dcb398 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -1116,3 +1116,4 @@ ja:
field_inherit_members: メンバーを継承
field_closed_on: 終了日
field_generate_password: パスワードを自動生成
+ label_total_time: 合計
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index eefa194..93e88c6 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -1137,3 +1137,4 @@ ko:
field_closed_on: Closed
field_generate_password: Generate password
setting_default_projects_tracker_ids: Default trackers for new projects
+ label_total_time: 합계
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index c462023..d830bea 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -1146,3 +1146,4 @@ lt:
field_closed_on: Closed
field_generate_password: Generate password
setting_default_projects_tracker_ids: Default trackers for new projects
+ label_total_time: Iš viso
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index c77eda9..91a2133 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -1081,3 +1081,4 @@ lv:
field_closed_on: Closed
field_generate_password: Generate password
setting_default_projects_tracker_ids: Default trackers for new projects
+ label_total_time: Kopā
diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index 88f73f0..c02f13d 100644
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -1087,3 +1087,4 @@ mk:
field_closed_on: Closed
field_generate_password: Generate password
setting_default_projects_tracker_ids: Default trackers for new projects
+ label_total_time: Вкупно
diff --git a/config/locales/mn.yml b/config/locales/mn.yml
index e9e04af..6ec884e 100644
--- a/config/locales/mn.yml
+++ b/config/locales/mn.yml
@@ -1088,3 +1088,4 @@ mn:
field_closed_on: Closed
field_generate_password: Generate password
setting_default_projects_tracker_ids: Default trackers for new projects
+ label_total_time: Нийт
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index f3ce181..f8fadda 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -1069,3 +1069,4 @@ nl:
field_closed_on: Closed
field_generate_password: Generate password
setting_default_projects_tracker_ids: Default trackers for new projects
+ label_total_time: Totaal
diff --git a/config/locales/no.yml b/config/locales/no.yml
index 04e7369..72db37d 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -1077,3 +1077,4 @@
field_closed_on: Closed
field_generate_password: Generate password
setting_default_projects_tracker_ids: Default trackers for new projects
+ label_total_time: Totalt
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index e8664d2..25ffcc8 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -1108,3 +1108,4 @@ pl:
field_closed_on: Closed
field_generate_password: Generate password
setting_default_projects_tracker_ids: Default trackers for new projects
+ label_total_time: Ogółem
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 8f5518e..801eddb 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -1107,3 +1107,4 @@ pt-BR:
field_closed_on: Fechado
field_generate_password: Gerar senha
setting_default_projects_tracker_ids: Default trackers for new projects
+ label_total_time: Total
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index 1498a24..e7c62fd 100644
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -1093,3 +1093,4 @@ pt:
field_closed_on: Fechado
field_generate_password: Generate password
setting_default_projects_tracker_ids: Default trackers for new projects
+ label_total_time: Total
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index 5a472ab..4e20b31 100644
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -1082,3 +1082,4 @@ ro:
field_closed_on: Closed
field_generate_password: Generate password
setting_default_projects_tracker_ids: Default trackers for new projects
+ label_total_time: Total
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 1c01dbd..9ef5d7a 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -1197,3 +1197,4 @@ ru:
field_closed_on: Закрыта
field_generate_password: Создание пароля
setting_default_projects_tracker_ids: Default trackers for new projects
+ label_total_time: Общее время
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 9c3561b..d25707c 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -1084,3 +1084,4 @@ sk:
field_closed_on: Closed
field_generate_password: Generate password
setting_default_projects_tracker_ids: Default trackers for new projects
+ label_total_time: Celkovo
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index bf91bf8..0b7957f 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -1087,3 +1087,4 @@ sl:
field_closed_on: Closed
field_generate_password: Generate password
setting_default_projects_tracker_ids: Default trackers for new projects
+ label_total_time: Skupaj
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index c271779..6f7e4cd 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -1083,3 +1083,4 @@ sq:
field_closed_on: Closed
field_generate_password: Generate password
setting_default_projects_tracker_ids: Default trackers for new projects
+ label_total_time: Total
diff --git a/config/locales/sr-YU.yml b/config/locales/sr-YU.yml
index 24483f5..27d0160 100644
--- a/config/locales/sr-YU.yml
+++ b/config/locales/sr-YU.yml
@@ -1089,3 +1089,4 @@ sr-YU:
field_closed_on: Closed
field_generate_password: Generate password
setting_default_projects_tracker_ids: Default trackers for new projects
+ label_total_time: Ukupno
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 8614ab3..4ffc3bc 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -1088,3 +1088,4 @@ sr:
field_closed_on: Closed
field_generate_password: Generate password
setting_default_projects_tracker_ids: Default trackers for new projects
+ label_total_time: Укупно
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index bc5a244..19b056f 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -1125,3 +1125,4 @@ sv:
field_closed_on: Closed
field_generate_password: Generate password
setting_default_projects_tracker_ids: Default trackers for new projects
+ label_total_time: Total
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 64333de..09b8792 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -1084,3 +1084,4 @@ th:
field_closed_on: Closed
field_generate_password: Generate password
setting_default_projects_tracker_ids: Default trackers for new projects
+ label_total_time: จำนวนรวม
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 2cac992..724a5b1 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -1106,3 +1106,4 @@ tr:
field_closed_on: Closed
field_generate_password: Generate password
setting_default_projects_tracker_ids: Default trackers for new projects
+ label_total_time: Toplam
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index e79f3b7..0718b2c 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -1082,3 +1082,4 @@ uk:
field_closed_on: Closed
field_generate_password: Generate password
setting_default_projects_tracker_ids: Default trackers for new projects
+ label_total_time: Всього
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 22a0631..3e06f12 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -1140,3 +1140,4 @@ vi:
field_closed_on: Đã đóng
field_generate_password: Generate password
setting_default_projects_tracker_ids: Default trackers for new projects
+ label_total_time: Tổng cộng
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index bbebce3..0ce3dd5 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -1167,3 +1167,4 @@
description_date_to: 輸入結束日期
text_repository_identifier_info: '僅允許使用小寫英文字母 (a-z), 阿拉伯數字, 虛線與底線。
一旦儲存之後, 代碼便無法再次被更改。'
setting_default_projects_tracker_ids: Default trackers for new projects
+ label_total_time: 總計
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 2e899c0..d6227dd 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -1091,3 +1091,4 @@ zh:
field_closed_on: Closed
field_generate_password: Generate password
setting_default_projects_tracker_ids: Default trackers for new projects
+ label_total_time: 合计
diff --git a/test/functional/time_entry_reports_controller_test.rb b/test/functional/time_entry_reports_controller_test.rb
index 7601361..755cdc3 100644
--- a/test/functional/time_entry_reports_controller_test.rb
+++ b/test/functional/time_entry_reports_controller_test.rb
@@ -140,7 +140,7 @@ class TimeEntryReportsControllerTest < ActionController::TestCase
assert_select 'th:nth-child(2)', :text => '2009-52'
assert_select 'th:nth-child(3)', :text => '2009-53'
assert_select 'th:nth-child(4)', :text => '2010-1'
- assert_select 'th:nth-child(5)', :text => 'Total'
+ assert_select 'th:nth-child(5)', :text => 'Total time'
end
assert_select '#time-report tbody tr' do
assert_select 'td:nth-child(1)', :text => 'eCookbook'
@@ -206,9 +206,9 @@ class TimeEntryReportsControllerTest < ActionController::TestCase
assert_equal 'text/csv; header=present', @response.content_type
lines = @response.body.chomp.split("\n")
# Headers
- assert_equal 'Project,User,Activity,2007-3,2007-4,Total', lines.first
+ assert_equal 'Project,User,Activity,2007-3,2007-4,Total time', lines.first
# Total row
- assert_equal 'Total,"","",154.25,8.65,162.90', lines.last
+ assert_equal 'Total time,"","",154.25,8.65,162.90', lines.last
end
def test_report_csv_export
@@ -219,9 +219,9 @@ class TimeEntryReportsControllerTest < ActionController::TestCase
assert_equal 'text/csv; header=present', @response.content_type
lines = @response.body.chomp.split("\n")
# Headers
- assert_equal 'Project,User,Activity,2007-3,2007-4,Total', lines.first
+ assert_equal 'Project,User,Activity,2007-3,2007-4,Total time', lines.first
# Total row
- assert_equal 'Total,"","",154.25,8.65,162.90', lines.last
+ assert_equal 'Total time,"","",154.25,8.65,162.90', lines.last
end
def test_csv_big_5
@@ -348,8 +348,8 @@ class TimeEntryReportsControllerTest < ActionController::TestCase
assert_equal 'text/csv; header=present', @response.content_type
lines = @response.body.chomp.split("\n")
# Headers
- s1 = "Utilisateur;2011-11-11;Total"
- s2 = "Total"
+ s1 = "Utilisateur;2011-11-11;Temps total"
+ s2 = "Temps total"
if s1.respond_to?(:force_encoding)
s1.force_encoding('ISO-8859-1')
s2.force_encoding('ISO-8859-1')