Fixes syntax for time logging in commit messages (#7630, #7718).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4951 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-02-26 14:46:19 +00:00
parent a78d565959
commit 2d115bbe70
2 changed files with 38 additions and 20 deletions
@@ -97,11 +97,13 @@ class Changeset < ActiveRecord::Base
  
  TIMELOG_RE = /
    (
-    (\d+([.,]\d+)?)h?
+    ((\d+)(h|hours?))((\d+)(m|min)?)?
+    |
+    ((\d+)(h|hours?|m|min))
    |
    (\d+):(\d+)
    |
-    ((\d+)(h|hours?))?((\d+)(m|min)?)?
+    (\d+([\.,]\d+)?)h?
    )
    /x