From eee1c99a0a71a94e0c6f60d997be60e42bf11aca Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Sun, 15 Nov 2020 12:37:17 +0000 Subject: [PATCH] remove spaces inside {} of lib/redmine/core_ext/string/conversions.rb git-svn-id: http://svn.redmine.org/redmine/trunk@20387 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- lib/redmine/core_ext/string/conversions.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/redmine/core_ext/string/conversions.rb b/lib/redmine/core_ext/string/conversions.rb index c52b334e4..d125448bd 100644 --- a/lib/redmine/core_ext/string/conversions.rb +++ b/lib/redmine/core_ext/string/conversions.rb @@ -33,9 +33,9 @@ module Redmine s = $1 else # 2:30 => 2.5 - s.gsub!(%r{^(\d+):(\d+)$}) { $1.to_i + $2.to_i / 60.0 } + s.gsub!(%r{^(\d+):(\d+)$}) {$1.to_i + $2.to_i / 60.0} # 2h30, 2h, 30m => 2.5, 2, 0.5 - s.gsub!(%r{^((\d+)\s*(h|hours?))?\s*((\d+)\s*(m|min)?)?$}i) { |m| ($1 || $4) ? ($2.to_i + $5.to_i / 60.0) : m[0] } + s.gsub!(%r{^((\d+)\s*(h|hours?))?\s*((\d+)\s*(m|min)?)?$}i) {|m| ($1 || $4) ? ($2.to_i + $5.to_i / 60.0) : m[0]} end # 2,5 => 2.5 s.tr!(',', '.') -- 2.39.5