From c96ef014dd8405e70cc30c5da0f7cffc98a153d4 Mon Sep 17 00:00:00 2001 From: Go MAEDA Date: Thu, 8 Aug 2024 04:24:44 +0000 Subject: Fix issue where minutes part of a time entry is displayed as 60 instead of being carried over (#36897). Patch by Go MAEDA (user:maeda). git-svn-id: https://svn.redmine.org/redmine/trunk@22946 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- lib/redmine/i18n.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/redmine') diff --git a/lib/redmine/i18n.rb b/lib/redmine/i18n.rb index 83ecb05eb..0488fa289 100644 --- a/lib/redmine/i18n.rb +++ b/lib/redmine/i18n.rb @@ -92,12 +92,12 @@ module Redmine def format_hours(hours) return "" if hours.blank? + minutes = (hours * 60).round if Setting.timespan_format == 'minutes' - h = hours.floor - m = ((hours - h) * 60).round + h, m = minutes.divmod(60) "%d:%02d" % [h, m] else - number_with_delimiter(sprintf('%.2f', hours.to_f), delimiter: nil) + number_with_delimiter(sprintf('%.2f', minutes.fdiv(60)), delimiter: nil) end end -- cgit v1.2.3