diff options
| author | Go MAEDA <maeda@farend.jp> | 2024-07-03 09:40:48 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2024-07-03 09:40:48 +0000 |
| commit | 713da39aa63e5a9027af0c6086daa9dba898e537 (patch) | |
| tree | feddcdfa0877e262fe6713d9cd0c50f683c55c6a /app/views | |
| parent | cf103b5a99b1e039d28a7fc74c14c971a6b90e0d (diff) | |
| download | redmine-713da39aa63e5a9027af0c6086daa9dba898e537.tar.gz redmine-713da39aa63e5a9027af0c6086daa9dba898e537.zip | |
Merged r22902 from trunk to 5.0-stable (#40924).
git-svn-id: https://svn.redmine.org/redmine/branches/5.0-stable@22904 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/issues/destroy.html.erb | 2 | ||||
| -rw-r--r-- | app/views/timelog/bulk_edit.html.erb | 2 |
2 files changed, 2 insertions, 2 deletions
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) ) %> |