meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-21 16:01:14 +00:00
Code Issues Releases Wiki Activity

remove spaces inside {} of lib/redmine/core_ext/string/conversions.rb

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@20387 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2020-11-15 12:37:17 +00:00
parent 3247ca8136
commit eee1c99a0a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/redmine/core_ext/string/conversions.rb
View File

@ -33,9 +33,9 @@ module Redmine
s = $1 s = $1
else else
# 2:30 => 2.5 # 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 # 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 end
# 2,5 => 2.5 # 2,5 => 2.5
s.tr!(',', '.') s.tr!(',', '.')