From 2b786a6f48e519b4f09e7804fc06fb531d01b9db Mon Sep 17 00:00:00 2001
From: Go MAEDA <maeda@farend.jp>
Date: Sun, 30 Jun 2024 14:37:12 +0000
Subject: Spent hours ignoring "Time Span Format" Setting on several pages
 (#40924).

Patch by Go MAEDA (@maeda).


git-svn-id: https://svn.redmine.org/redmine/trunk@22902 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/issues/destroy.html.erb    | 2 +-
 app/views/timelog/bulk_edit.html.erb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'app/views')

diff --git a/app/views/issues/destroy.html.erb b/app/views/issues/destroy.html.erb
index 61b841a62..e4f0e66fb 100644
--- a/app/views/issues/destroy.html.erb
+++ b/app/views/issues/destroy.html.erb
@@ -3,7 +3,7 @@
 <%= form_tag({}, :method => :delete)  do %>
 <%= @issues.collect {|i| hidden_field_tag('ids[]', i.id, :id => nil)}.join("\n").html_safe %>
 <div class="box">
-<p><strong><%= l(:text_destroy_time_entries_question, :hours => number_with_precision(@hours, :precision => 2)) %></strong></p>
+<p><strong><%= l(:text_destroy_time_entries_question, :hours => format_hours(@hours)) %></strong></p>
 <p>
 <label><%= radio_button_tag 'todo', 'destroy', true %> <%= l(:text_destroy_time_entries) %></label><br />
 <% unless Setting.timelog_required_fields.include?('issue_id') %>
diff --git a/app/views/timelog/bulk_edit.html.erb b/app/views/timelog/bulk_edit.html.erb
index 3571b4016..a4cb0c8af 100644
--- a/app/views/timelog/bulk_edit.html.erb
+++ b/app/views/timelog/bulk_edit.html.erb
@@ -21,7 +21,7 @@
   <%=
     content_tag 'li',
       link_to(
-        "#{format_date(entry.spent_on)} - #{entry.project}: #{l(:label_f_hour_plural, :value => entry.hours)} (#{entry.user})",
+        "#{format_date(entry.spent_on)} - #{entry.project}: #{l(:label_f_hour_plural, :value => format_hours(entry.hours))} (#{entry.user})",
         edit_time_entry_path(entry)
       )
   %>
-- 
cgit v1.2.3