Commit f42bebca authored by jplang's avatar jplang
Browse files

Adds label_total_time string (#13337).

git-svn-id: https://svn.redmine.org/redmine/trunk@11582 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent c7c4f546
......@@ -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|
......
......@@ -5,7 +5,7 @@ entries_by_day = entries.group_by(&:spent_on)
%>
<div class="total-hours">
<p><%= l(:label_total) %>: <%= html_hours("%.2f" % entries.sum(&:hours).to_f) %></p>
<p><%= l(:label_total_time) %>: <%= html_hours("%.2f" % entries.sum(&:hours).to_f) %></p>
</div>
<% if entries.any? %>
......
......@@ -13,7 +13,7 @@
<% end %>
<div class="total-hours">
<p><%= l(:label_total) %>: <%= html_hours(l_hours(@total_hours)) %></p>
<p><%= l(:label_total_time) %>: <%= html_hours(l_hours(@total_hours)) %></p>
</div>
<% unless @entries.empty? %>
......
......@@ -30,7 +30,7 @@
<% unless @report.criteria.empty? %>
<div class="total-hours">
<p><%= l(:label_total) %>: <%= html_hours(l_hours(@report.total_hours)) %></p>
<p><%= l(:label_total_time) %>: <%= html_hours(l_hours(@report.total_hours)) %></p>
</div>
<% unless @report.hours.empty? %>
......@@ -45,13 +45,13 @@
<% @report.periods.each do |period| %>
<th class="period" width="<%= columns_width %>%"><%= period %></th>
<% end %>
<th class="total" width="<%= columns_width %>%"><%= l(:label_total) %></th>
<th class="total" width="<%= columns_width %>%"><%= l(:label_total_time) %></th>
</tr>
</thead>
<tbody>
<%= render :partial => 'report_criteria', :locals => {:criterias => @report.criteria, :hours => @report.hours, :level => 0} %>
<tr class="total">
<td><%= l(:label_total) %></td>
<td><%= l(:label_total_time) %></td>
<%= ('<td></td>' * (@report.criteria.size - 1)).html_safe %>
<% total = 0 -%>
<% @report.periods.each do |period| -%>
......
......@@ -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: الإجمالي
......@@ -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
......@@ -1084,3 +1084,4 @@ bg:
description_date_from: Въведете начална дата
description_date_to: Въведете крайна дата
text_repository_identifier_info: 'Позволени са малки букви (a-z), цифри, тирета и _.<br />Промяна след създаването му не е възможна.'
label_total_time: Общо
......@@ -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
......@@ -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
......@@ -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
......@@ -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
......@@ -1099,4 +1099,4 @@ de:
version_status_open: offen
warning_attachments_not_saved: "%{count} Datei(en) konnten nicht gespeichert werden."
label_total_time: Gesamtzeit
......@@ -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: Σύνολο
......@@ -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
......@@ -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
......
......@@ -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
......@@ -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"
......@@ -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
......@@ -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: جمله
......@@ -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ä
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