diff options
| -rw-r--r-- | lib/redmine/core_ext/string/conversions.rb | 2 | ||||
| -rw-r--r-- | test/unit/time_entry_test.rb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/redmine/core_ext/string/conversions.rb b/lib/redmine/core_ext/string/conversions.rb index 6d9d50731..3001904e1 100644 --- a/lib/redmine/core_ext/string/conversions.rb +++ b/lib/redmine/core_ext/string/conversions.rb @@ -30,7 +30,7 @@ module Redmine #:nodoc: # 2:30 => 2.5 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)?)?$}) { |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.gsub!(',', '.') diff --git a/test/unit/time_entry_test.rb b/test/unit/time_entry_test.rb index ddef645bb..3bc1f8f56 100644 --- a/test/unit/time_entry_test.rb +++ b/test/unit/time_entry_test.rb @@ -45,6 +45,7 @@ class TimeEntryTest < ActiveSupport::TestCase "3 h 15 m" => 3.25, "3 hours" => 3.0, "12min" => 0.2, + "12 Min" => 0.2, } assertions.each do |k, v| |