diff -crBx .git redmine-trunk/app/models/changeset.rb redmine-trunk-new/app/models/changeset.rb
*** redmine-trunk/app/models/changeset.rb 2009-11-02 14:27:14.457816133 +0100
--- redmine-trunk-new/app/models/changeset.rb 2009-11-02 14:18:31.767191074 +0100
***************
*** 85,102 ****
return if kw_regexp.blank?
referenced_issues = []
if ref_keywords.delete('*')
# find any issue ID in the comments
target_issue_ids = []
! comments.scan(%r{([\s\(\[,-]|^)#(\d+)(?=[[:punct:]]|\s|<|$)}).each { |m| target_issue_ids << m[1] }
referenced_issues += repository.project.issues.find_all_by_id(target_issue_ids)
end
!
! comments.scan(Regexp.new("(#{kw_regexp})[\s:]+(([\s,;&]*#?\\d+)+)", Regexp::IGNORECASE)).each do |match|
action = match[0]
! target_issue_ids = match[1].scan(/\d+/)
target_issues = repository.project.issues.find_all_by_id(target_issue_ids)
if fix_status && fix_keywords.include?(action.downcase)
# update status of issues
logger.debug "Issues fixed by changeset #{self.revision}: #{issue_ids.join(', ')}." if logger && logger.debug?
--- 85,115 ----
return if kw_regexp.blank?
referenced_issues = []
+ log_time = []
if ref_keywords.delete('*')
# find any issue ID in the comments
target_issue_ids = []
!
! comments.scan(%r{([\s\(\[,-]|[^@]|^)#?(\d+)([\s]*@(\d+[.]\d+|(\d+[hm]\s?){1,2}))?(?=[[:punct:]]|\s|<|$)}).each do |m|
! target_issue_ids << m[1]
! log_time << [m[1], (m[2] != nil ? m[2].scan(/(\d+[.]\d+|(\d+[hm]\s?){1,2})/)[0][0] : 0)]
! end
!
referenced_issues += repository.project.issues.find_all_by_id(target_issue_ids)
end
!
! comments.scan(Regexp.new("(#{kw_regexp})[\s:]+((([\s,;&]*([^@]|#?)\\d+)([\s]*@(\\d+[.]\\d+|(\\d+[hm]\s?){1,2}))?)+)", Regexp::IGNORECASE)).each do |match|
action = match[0]
!
! target_issues_with_log = match[1].scan(/([\s,;&]*([^@]|#?)\d+)([\s]*@(\d+[.]\d+|(\d+[hm]\s?){1,2}))/)
! target_issues_with_log.collect! { |x| [ x[0].scan(/\d+/)[0], (x[2] != nil ? x[3].scan(/(\d+[.]\d+|(\d+[hm]\s?){1,2})/)[0][0] : 0) ] }
!
! log_time += target_issues_with_log
!
! target_issue_ids = target_issues_with_log.collect {|x| x[0]}
target_issues = repository.project.issues.find_all_by_id(target_issue_ids)
+
if fix_status && fix_keywords.include?(action.downcase)
# update status of issues
logger.debug "Issues fixed by changeset #{self.revision}: #{issue_ids.join(', ')}." if logger && logger.debug?
***************
*** 117,124 ****
--- 130,188 ----
issue.save
end
end
+
referenced_issues += target_issues
end
+
+ if Setting.commit_logtime_enabled?
+ log_time.each do |issue_wl|
+ next if issue_wl[1] == nil || issue_wl[1] == 0
+
+ issue_id = issue_wl[0]
+ issue_hours = issue_wl[1]
+
+ match = issue_hours.match(/\d+[.]\d+/)
+
+ if match != nil
+ issue_hours = match[0].to_f
+ else
+ hours = ((match = issue_hours.scan(/(\d+)h/)).size == 1 ? match[0][0] : 0)
+ minutes = ((match = issue_hours.scan(/(\d+)m/)).size == 1 ? match[0][0] : 0)
+
+ hours = (hours == nil ? 0 : hours.to_i)
+ minutes = (minutes == nil ? 0 : minutes.to_i)
+
+ issue_hours = ((hours.to_f + minutes.to_f / 60.0) * 100.0).round / 100.0
+ end
+
+ next if issue_hours.to_f <= 0
+
+ logger.debug "Log time for issue #{issue_id} - #{issue_hours}." if logger && logger.debug?
+
+ issue = repository.project.issues.find_by_id(issue_id)
+
+ activity = TimeEntryActivity.default
+ if activity == nil
+ activity = TimeEntryActivity.values[0]
+ end
+
+ next if activity == nil || issue == nil || user == nil
+
+ csettext = "from revision r#{self.revision}"
+ if self.scmid && (! (csettext =~ /^r[0-9]+$/))
+ csettext = "from revision \"#{self.scmid}\""
+ end
+
+ timeentry = TimeEntry.create(:project => repository.project,
+ :issue => issue,
+ :user => user,
+ :spent_on => self.commit_date,
+ :hours => issue_hours,
+ :activity_id => activity.id,
+ :comments => csettext)
+ timeentry.save
+ end
+ end
self.issues = referenced_issues.uniq
end
diff -crBx .git redmine-trunk/app/views/settings/_repositories.rhtml redmine-trunk-new/app/views/settings/_repositories.rhtml
*** redmine-trunk/app/views/settings/_repositories.rhtml 2009-11-02 14:27:14.457816133 +0100
--- redmine-trunk-new/app/views/settings/_repositories.rhtml 2009-11-02 14:15:04.114372491 +0100
***************
*** 37,42 ****
--- 37,46 ----
<%= l(:label_applied_status) %>: <%= select_tag 'settings[commit_fix_status_id]', options_for_select( [["", 0]] + IssueStatus.find(:all).collect{|status| [status.name, status.id.to_s]}, Setting.commit_fix_status_id) %>
<%= l(:field_done_ratio) %>: <%= select_tag 'settings[commit_fix_done_ratio]', options_for_select( [[l(:label_no_change_option), '']] + ((0..10).to_a.collect {|r| ["#{r*10} %", "#{r*10}"] }), Setting.commit_fix_done_ratio) %>
<%= l(:text_comma_separated) %>
+
+
+ <%= hidden_field_tag 'settings[commit_logtime_enabled]', 0 %><%= check_box_tag 'settings[commit_logtime_enabled]', 1, Setting.commit_logtime_enabled? %>
+
<%= l(:text_commit_logtime) %>
<%= submit_tag l(:button_save) %>
diff -crBx .git redmine-trunk/config/locales/bg.yml redmine-trunk-new/config/locales/bg.yml
*** redmine-trunk/config/locales/bg.yml 2009-11-02 14:04:26.000000000 +0100
--- redmine-trunk-new/config/locales/bg.yml 2009-11-02 15:41:08.077360964 +0100
***************
*** 827,829 ****
--- 827,832 ----
field_active: Active
enumeration_system_activity: System Activity
permission_delete_issue_watchers: Delete watchers
+ setting_commit_logtime_enabled: Enable time logging
+ text_commit_logtime: "Allows to log time in commit messages. Examples: refs #123 @1.5 or refs #123 @1h30m or fixes #123 @1h 30m (logs one hour and 30 minutes for issue #123)"
+
diff -crBx .git redmine-trunk/config/locales/bs.yml redmine-trunk-new/config/locales/bs.yml
*** redmine-trunk/config/locales/bs.yml 2009-11-02 14:04:26.000000000 +0100
--- redmine-trunk-new/config/locales/bs.yml 2009-11-02 15:41:08.083866570 +0100
***************
*** 851,853 ****
--- 851,856 ----
field_active: Active
enumeration_system_activity: System Activity
permission_delete_issue_watchers: Delete watchers
+ setting_commit_logtime_enabled: Enable time logging
+ text_commit_logtime: "Allows to log time in commit messages. Examples: refs #123 @1.5 or refs #123 @1h30m or fixes #123 @1h 30m (logs one hour and 30 minutes for issue #123)"
+
diff -crBx .git redmine-trunk/config/locales/ca.yml redmine-trunk-new/config/locales/ca.yml
*** redmine-trunk/config/locales/ca.yml 2009-11-02 14:04:26.000000000 +0100
--- redmine-trunk-new/config/locales/ca.yml 2009-11-02 15:41:08.093968541 +0100
***************
*** 830,832 ****
--- 830,835 ----
field_active: Active
enumeration_system_activity: System Activity
permission_delete_issue_watchers: Delete watchers
+ setting_commit_logtime_enabled: Enable time logging
+ text_commit_logtime: "Allows to log time in commit messages. Examples: refs #123 @1.5 or refs #123 @1h30m or fixes #123 @1h 30m (logs one hour and 30 minutes for issue #123)"
+
diff -crBx .git redmine-trunk/config/locales/cs.yml redmine-trunk-new/config/locales/cs.yml
*** redmine-trunk/config/locales/cs.yml 2009-11-02 14:04:26.000000000 +0100
--- redmine-trunk-new/config/locales/cs.yml 2009-11-02 15:42:17.024943252 +0100
***************
*** 833,835 ****
--- 833,838 ----
field_active: Active
enumeration_system_activity: System Activity
permission_delete_issue_watchers: Delete watchers
+ setting_commit_logtime_enabled: Povolit automatický záznam stráveného času
+ text_commit_logtime: "Umožní automatický záznam stráveného času podle zpávy k revizi. Příklad: refs #123 @1.5 nebo refs #123 @1h30m nebo fixes #123 @1h 30m (zaznamená jednu hodinu a 30 minut k úkolu #123)"
+
diff -crBx .git redmine-trunk/config/locales/da.yml redmine-trunk-new/config/locales/da.yml
*** redmine-trunk/config/locales/da.yml 2009-11-02 14:04:26.000000000 +0100
--- redmine-trunk-new/config/locales/da.yml 2009-11-02 15:41:08.104051769 +0100
***************
*** 853,855 ****
--- 853,858 ----
field_active: Active
enumeration_system_activity: System Activity
permission_delete_issue_watchers: Delete watchers
+ setting_commit_logtime_enabled: Enable time logging
+ text_commit_logtime: "Allows to log time in commit messages. Examples: refs #123 @1.5 or refs #123 @1h30m or fixes #123 @1h 30m (logs one hour and 30 minutes for issue #123)"
+
diff -crBx .git redmine-trunk/config/locales/de.yml redmine-trunk-new/config/locales/de.yml
*** redmine-trunk/config/locales/de.yml 2009-11-02 14:04:26.000000000 +0100
--- redmine-trunk-new/config/locales/de.yml 2009-11-02 15:41:50.111779652 +0100
***************
*** 853,855 ****
--- 853,858 ----
field_active: Active
enumeration_system_activity: System Activity
permission_delete_issue_watchers: Delete watchers
+ setting_commit_logtime_enabled: Aufwände automatisch buchen
+ text_commit_logtime: "Ermöglicht automatische Buchung von Aufwänden via Commit-Log-Meldungen. Bsp.: refs #123 @1.5 oder refs #123 @1h30m oder fixes #123 @1h 30m (bucht ein Aufwand von einer Stunde und 30 Minuten für das Ticket #123)"
+
diff -crBx .git redmine-trunk/config/locales/el.yml redmine-trunk-new/config/locales/el.yml
*** redmine-trunk/config/locales/el.yml 2009-11-02 14:04:26.000000000 +0100
--- redmine-trunk-new/config/locales/el.yml 2009-11-02 15:41:08.120391561 +0100
***************
*** 833,835 ****
--- 833,838 ----
field_active: Active
enumeration_system_activity: System Activity
permission_delete_issue_watchers: Delete watchers
+ setting_commit_logtime_enabled: Enable time logging
+ text_commit_logtime: "Allows to log time in commit messages. Examples: refs #123 @1.5 or refs #123 @1h30m or fixes #123 @1h 30m (logs one hour and 30 minutes for issue #123)"
+
diff -crBx .git redmine-trunk/config/locales/en.yml redmine-trunk-new/config/locales/en.yml
*** redmine-trunk/config/locales/en.yml 2009-11-02 14:04:26.000000000 +0100
--- redmine-trunk-new/config/locales/en.yml 2009-11-02 15:41:31.071047322 +0100
***************
*** 832,834 ****
--- 832,837 ----
enumeration_doc_categories: Document categories
enumeration_activities: Activities (time tracking)
enumeration_system_activity: System Activity
+ setting_commit_logtime_enabled: Enable time logging
+ text_commit_logtime: "Allows to log time in commit messages. Examples: refs #123 @1.5 or refs #123 @1h30m or fixes #123 @1h 30m (logs one hour and 30 minutes for issue #123)"
+
diff -crBx .git redmine-trunk/config/locales/es.yml redmine-trunk-new/config/locales/es.yml
*** redmine-trunk/config/locales/es.yml 2009-11-02 14:04:26.000000000 +0100
--- redmine-trunk-new/config/locales/es.yml 2009-11-02 15:41:08.130388769 +0100
***************
*** 874,876 ****
--- 874,879 ----
field_active: Active
enumeration_system_activity: System Activity
permission_delete_issue_watchers: Delete watchers
+ setting_commit_logtime_enabled: Enable time logging
+ text_commit_logtime: "Allows to log time in commit messages. Examples: refs #123 @1.5 or refs #123 @1h30m or fixes #123 @1h 30m (logs one hour and 30 minutes for issue #123)"
+
diff -crBx .git redmine-trunk/config/locales/fi.yml redmine-trunk-new/config/locales/fi.yml
*** redmine-trunk/config/locales/fi.yml 2009-11-02 14:04:26.000000000 +0100
--- redmine-trunk-new/config/locales/fi.yml 2009-11-02 15:41:08.134281151 +0100
***************
*** 863,865 ****
--- 863,868 ----
field_active: Active
enumeration_system_activity: System Activity
permission_delete_issue_watchers: Delete watchers
+ setting_commit_logtime_enabled: Enable time logging
+ text_commit_logtime: "Allows to log time in commit messages. Examples: refs #123 @1.5 or refs #123 @1h30m or fixes #123 @1h 30m (logs one hour and 30 minutes for issue #123)"
+
diff -crBx .git redmine-trunk/config/locales/fr.yml redmine-trunk-new/config/locales/fr.yml
*** redmine-trunk/config/locales/fr.yml 2009-11-02 14:04:26.000000000 +0100
--- redmine-trunk-new/config/locales/fr.yml 2009-11-02 15:41:08.144354297 +0100
***************
*** 855,857 ****
--- 855,860 ----
text_journal_added: "{{label}} {{value}} ajouté"
field_active: Actif
enumeration_system_activity: Activité système
+ setting_commit_logtime_enabled: Enable time logging
+ text_commit_logtime: "Allows to log time in commit messages. Examples: refs #123 @1.5 or refs #123 @1h30m or fixes #123 @1h 30m (logs one hour and 30 minutes for issue #123)"
+
diff -crBx .git redmine-trunk/config/locales/gl.yml redmine-trunk-new/config/locales/gl.yml
*** redmine-trunk/config/locales/gl.yml 2009-11-02 14:04:26.000000000 +0100
--- redmine-trunk-new/config/locales/gl.yml 2009-11-02 15:41:08.147446495 +0100
***************
*** 853,855 ****
--- 853,858 ----
field_active: Active
enumeration_system_activity: System Activity
permission_delete_issue_watchers: Delete watchers
+ setting_commit_logtime_enabled: Enable time logging
+ text_commit_logtime: "Allows to log time in commit messages. Examples: refs #123 @1.5 or refs #123 @1h30m or fixes #123 @1h 30m (logs one hour and 30 minutes for issue #123)"
+
diff -crBx .git redmine-trunk/config/locales/he.yml redmine-trunk-new/config/locales/he.yml
*** redmine-trunk/config/locales/he.yml 2009-11-02 14:04:26.000000000 +0100
--- redmine-trunk-new/config/locales/he.yml 2009-11-02 15:41:08.154418509 +0100
***************
*** 837,839 ****
--- 837,842 ----
field_active: Active
enumeration_system_activity: System Activity
permission_delete_issue_watchers: Delete watchers
+ setting_commit_logtime_enabled: Enable time logging
+ text_commit_logtime: "Allows to log time in commit messages. Examples: refs #123 @1.5 or refs #123 @1h30m or fixes #123 @1h 30m (logs one hour and 30 minutes for issue #123)"
+
diff -crBx .git redmine-trunk/config/locales/hu.yml redmine-trunk-new/config/locales/hu.yml
*** redmine-trunk/config/locales/hu.yml 2009-11-02 14:04:26.000000000 +0100
--- redmine-trunk-new/config/locales/hu.yml 2009-11-02 15:41:08.159747728 +0100
***************
*** 858,860 ****
--- 858,863 ----
field_active: Active
enumeration_system_activity: System Activity
permission_delete_issue_watchers: Delete watchers
+ setting_commit_logtime_enabled: Enable time logging
+ text_commit_logtime: "Allows to log time in commit messages. Examples: refs #123 @1.5 or refs #123 @1h30m or fixes #123 @1h 30m (logs one hour and 30 minutes for issue #123)"
+
diff -crBx .git redmine-trunk/config/locales/it.yml redmine-trunk-new/config/locales/it.yml
*** redmine-trunk/config/locales/it.yml 2009-11-02 14:04:26.000000000 +0100
--- redmine-trunk-new/config/locales/it.yml 2009-11-02 15:41:08.167882133 +0100
***************
*** 840,842 ****
--- 840,845 ----
field_active: Active
enumeration_system_activity: System Activity
permission_delete_issue_watchers: Delete watchers
+ setting_commit_logtime_enabled: Enable time logging
+ text_commit_logtime: "Allows to log time in commit messages. Examples: refs #123 @1.5 or refs #123 @1h30m or fixes #123 @1h 30m (logs one hour and 30 minutes for issue #123)"
+
diff -crBx .git redmine-trunk/config/locales/ja.yml redmine-trunk-new/config/locales/ja.yml
*** redmine-trunk/config/locales/ja.yml 2009-11-02 14:04:26.000000000 +0100
--- redmine-trunk-new/config/locales/ja.yml 2009-11-02 15:41:08.174543630 +0100
***************
*** 862,864 ****
--- 862,867 ----
field_active: Active
enumeration_system_activity: System Activity
permission_delete_issue_watchers: Delete watchers
+ setting_commit_logtime_enabled: Enable time logging
+ text_commit_logtime: "Allows to log time in commit messages. Examples: refs #123 @1.5 or refs #123 @1h30m or fixes #123 @1h 30m (logs one hour and 30 minutes for issue #123)"
+
diff -crBx .git redmine-trunk/config/locales/ko.yml redmine-trunk-new/config/locales/ko.yml
*** redmine-trunk/config/locales/ko.yml 2009-11-02 14:04:26.000000000 +0100
--- redmine-trunk-new/config/locales/ko.yml 2009-11-02 15:41:08.177880017 +0100
***************
*** 893,895 ****
--- 893,898 ----
field_active: Active
enumeration_system_activity: System Activity
permission_delete_issue_watchers: Delete watchers
+ setting_commit_logtime_enabled: Enable time logging
+ text_commit_logtime: "Allows to log time in commit messages. Examples: refs #123 @1.5 or refs #123 @1h30m or fixes #123 @1h 30m (logs one hour and 30 minutes for issue #123)"
+
diff -crBx .git redmine-trunk/config/locales/lt.yml redmine-trunk-new/config/locales/lt.yml
*** redmine-trunk/config/locales/lt.yml 2009-11-02 14:04:26.000000000 +0100
--- redmine-trunk-new/config/locales/lt.yml 2009-11-02 15:41:08.183833658 +0100
***************
*** 863,865 ****
--- 863,868 ----
field_active: Active
enumeration_system_activity: System Activity
permission_delete_issue_watchers: Delete watchers
+ setting_commit_logtime_enabled: Enable time logging
+ text_commit_logtime: "Allows to log time in commit messages. Examples: refs #123 @1.5 or refs #123 @1h30m or fixes #123 @1h 30m (logs one hour and 30 minutes for issue #123)"
+
diff -crBx .git redmine-trunk/config/locales/nl.yml redmine-trunk-new/config/locales/nl.yml
*** redmine-trunk/config/locales/nl.yml 2009-11-02 14:04:26.000000000 +0100
--- redmine-trunk-new/config/locales/nl.yml 2009-11-02 15:41:08.191499584 +0100
***************
*** 815,817 ****
--- 815,820 ----
field_active: Active
enumeration_system_activity: System Activity
permission_delete_issue_watchers: Delete watchers
+ setting_commit_logtime_enabled: Enable time logging
+ text_commit_logtime: "Allows to log time in commit messages. Examples: refs #123 @1.5 or refs #123 @1h30m or fixes #123 @1h 30m (logs one hour and 30 minutes for issue #123)"
+
diff -crBx .git redmine-trunk/config/locales/no.yml redmine-trunk-new/config/locales/no.yml
*** redmine-trunk/config/locales/no.yml 2009-11-02 14:04:26.000000000 +0100
--- redmine-trunk-new/config/locales/no.yml 2009-11-02 15:41:08.193911274 +0100
***************
*** 828,830 ****
--- 828,833 ----
field_active: Active
enumeration_system_activity: System Activity
permission_delete_issue_watchers: Delete watchers
+ setting_commit_logtime_enabled: Enable time logging
+ text_commit_logtime: "Allows to log time in commit messages. Examples: refs #123 @1.5 or refs #123 @1h30m or fixes #123 @1h 30m (logs one hour and 30 minutes for issue #123)"
+
diff -crBx .git redmine-trunk/config/locales/pt.yml redmine-trunk-new/config/locales/pt.yml
*** redmine-trunk/config/locales/pt.yml 2009-11-02 14:04:26.000000000 +0100
--- redmine-trunk-new/config/locales/pt.yml 2009-11-02 15:41:08.214071160 +0100
***************
*** 845,847 ****
--- 845,850 ----
field_active: Active
enumeration_system_activity: System Activity
permission_delete_issue_watchers: Delete watchers
+ setting_commit_logtime_enabled: Enable time logging
+ text_commit_logtime: "Allows to log time in commit messages. Examples: refs #123 @1.5 or refs #123 @1h30m or fixes #123 @1h 30m (logs one hour and 30 minutes for issue #123)"
+
diff -crBx .git redmine-trunk/config/locales/ro.yml redmine-trunk-new/config/locales/ro.yml
*** redmine-trunk/config/locales/ro.yml 2009-11-02 14:04:26.000000000 +0100
--- redmine-trunk-new/config/locales/ro.yml 2009-11-02 15:41:08.221228519 +0100
***************
*** 830,832 ****
--- 830,835 ----
field_active: Active
enumeration_system_activity: System Activity
permission_delete_issue_watchers: Delete watchers
+ setting_commit_logtime_enabled: Enable time logging
+ text_commit_logtime: "Allows to log time in commit messages. Examples: refs #123 @1.5 or refs #123 @1h30m or fixes #123 @1h 30m (logs one hour and 30 minutes for issue #123)"
+
diff -crBx .git redmine-trunk/config/locales/ru.yml redmine-trunk-new/config/locales/ru.yml
*** redmine-trunk/config/locales/ru.yml 2009-11-02 14:04:26.000000000 +0100
--- redmine-trunk-new/config/locales/ru.yml 2009-11-02 15:41:08.227891331 +0100
***************
*** 941,943 ****
--- 941,946 ----
field_active: Active
enumeration_system_activity: System Activity
permission_delete_issue_watchers: Delete watchers
+ setting_commit_logtime_enabled: Enable time logging
+ text_commit_logtime: "Allows to log time in commit messages. Examples: refs #123 @1.5 or refs #123 @1h30m or fixes #123 @1h 30m (logs one hour and 30 minutes for issue #123)"
+
diff -crBx .git redmine-trunk/config/locales/sk.yml redmine-trunk-new/config/locales/sk.yml
*** redmine-trunk/config/locales/sk.yml 2009-11-02 14:04:26.000000000 +0100
--- redmine-trunk-new/config/locales/sk.yml 2009-11-02 15:41:08.234234400 +0100
***************
*** 832,834 ****
--- 832,837 ----
field_active: Active
enumeration_system_activity: System Activity
permission_delete_issue_watchers: Delete watchers
+ setting_commit_logtime_enabled: Enable time logging
+ text_commit_logtime: "Allows to log time in commit messages. Examples: refs #123 @1.5 or refs #123 @1h30m or fixes #123 @1h 30m (logs one hour and 30 minutes for issue #123)"
+
diff -crBx .git redmine-trunk/config/locales/sl.yml redmine-trunk-new/config/locales/sl.yml
*** redmine-trunk/config/locales/sl.yml 2009-11-02 14:04:26.000000000 +0100
--- redmine-trunk-new/config/locales/sl.yml 2009-11-02 15:41:08.239887423 +0100
***************
*** 829,831 ****
--- 829,834 ----
field_active: Active
enumeration_system_activity: System Activity
permission_delete_issue_watchers: Delete watchers
+ setting_commit_logtime_enabled: Enable time logging
+ text_commit_logtime: "Allows to log time in commit messages. Examples: refs #123 @1.5 or refs #123 @1h30m or fixes #123 @1h 30m (logs one hour and 30 minutes for issue #123)"
+
diff -crBx .git redmine-trunk/config/locales/sr.yml redmine-trunk-new/config/locales/sr.yml
*** redmine-trunk/config/locales/sr.yml 2009-11-02 14:04:26.000000000 +0100
--- redmine-trunk-new/config/locales/sr.yml 2009-11-02 15:41:08.244307766 +0100
***************
*** 848,850 ****
--- 848,853 ----
field_active: Active
enumeration_system_activity: System Activity
permission_delete_issue_watchers: Delete watchers
+ setting_commit_logtime_enabled: Enable time logging
+ text_commit_logtime: "Allows to log time in commit messages. Examples: refs #123 @1.5 or refs #123 @1h30m or fixes #123 @1h 30m (logs one hour and 30 minutes for issue #123)"
+
diff -crBx .git redmine-trunk/config/locales/sv.yml redmine-trunk-new/config/locales/sv.yml
*** redmine-trunk/config/locales/sv.yml 2009-11-02 14:04:26.000000000 +0100
--- redmine-trunk-new/config/locales/sv.yml 2009-11-02 15:41:08.247564281 +0100
***************
*** 880,882 ****
--- 880,885 ----
field_active: Active
enumeration_system_activity: System Activity
permission_delete_issue_watchers: Delete watchers
+ setting_commit_logtime_enabled: Enable time logging
+ text_commit_logtime: "Allows to log time in commit messages. Examples: refs #123 @1.5 or refs #123 @1h30m or fixes #123 @1h 30m (logs one hour and 30 minutes for issue #123)"
+
diff -crBx .git redmine-trunk/config/locales/th.yml redmine-trunk-new/config/locales/th.yml
*** redmine-trunk/config/locales/th.yml 2009-11-02 14:04:26.000000000 +0100
--- redmine-trunk-new/config/locales/th.yml 2009-11-02 15:41:08.257886764 +0100
***************
*** 830,832 ****
--- 830,835 ----
field_active: Active
enumeration_system_activity: System Activity
permission_delete_issue_watchers: Delete watchers
+ setting_commit_logtime_enabled: Enable time logging
+ text_commit_logtime: "Allows to log time in commit messages. Examples: refs #123 @1.5 or refs #123 @1h30m or fixes #123 @1h 30m (logs one hour and 30 minutes for issue #123)"
+
diff -crBx .git redmine-trunk/config/locales/tr.yml redmine-trunk-new/config/locales/tr.yml
*** redmine-trunk/config/locales/tr.yml 2009-11-02 14:04:26.000000000 +0100
--- redmine-trunk-new/config/locales/tr.yml 2009-11-02 15:41:08.260638248 +0100
***************
*** 860,862 ****
--- 860,865 ----
field_active: Active
enumeration_system_activity: System Activity
permission_delete_issue_watchers: Delete watchers
+ setting_commit_logtime_enabled: Enable time logging
+ text_commit_logtime: "Allows to log time in commit messages. Examples: refs #123 @1.5 or refs #123 @1h30m or fixes #123 @1h 30m (logs one hour and 30 minutes for issue #123)"
+
diff -crBx .git redmine-trunk/config/locales/uk.yml redmine-trunk-new/config/locales/uk.yml
*** redmine-trunk/config/locales/uk.yml 2009-11-02 14:04:26.000000000 +0100
--- redmine-trunk-new/config/locales/uk.yml 2009-11-02 15:41:08.271213770 +0100
***************
*** 829,831 ****
--- 829,834 ----
field_active: Active
enumeration_system_activity: System Activity
permission_delete_issue_watchers: Delete watchers
+ setting_commit_logtime_enabled: Enable time logging
+ text_commit_logtime: "Allows to log time in commit messages. Examples: refs #123 @1.5 or refs #123 @1h30m or fixes #123 @1h 30m (logs one hour and 30 minutes for issue #123)"
+
diff -crBx .git redmine-trunk/config/locales/vi.yml redmine-trunk-new/config/locales/vi.yml
*** redmine-trunk/config/locales/vi.yml 2009-11-02 14:04:26.000000000 +0100
--- redmine-trunk-new/config/locales/vi.yml 2009-11-02 15:41:08.273833145 +0100
***************
*** 892,894 ****
--- 892,897 ----
field_active: Active
enumeration_system_activity: System Activity
permission_delete_issue_watchers: Delete watchers
+ setting_commit_logtime_enabled: Enable time logging
+ text_commit_logtime: "Allows to log time in commit messages. Examples: refs #123 @1.5 or refs #123 @1h30m or fixes #123 @1h 30m (logs one hour and 30 minutes for issue #123)"
+
diff -crBx .git redmine-trunk/config/locales/zh.yml redmine-trunk-new/config/locales/zh.yml
*** redmine-trunk/config/locales/zh.yml 2009-11-02 14:04:26.000000000 +0100
--- redmine-trunk-new/config/locales/zh.yml 2009-11-02 15:41:08.283906476 +0100
***************
*** 855,857 ****
--- 855,860 ----
field_active: Active
enumeration_system_activity: System Activity
permission_delete_issue_watchers: Delete watchers
+ setting_commit_logtime_enabled: Enable time logging
+ text_commit_logtime: "Allows to log time in commit messages. Examples: refs #123 @1.5 or refs #123 @1h30m or fixes #123 @1h 30m (logs one hour and 30 minutes for issue #123)"
+
diff -crBx .git redmine-trunk/config/settings.yml redmine-trunk-new/config/settings.yml
*** redmine-trunk/config/settings.yml 2009-11-02 14:27:14.461141609 +0100
--- redmine-trunk-new/config/settings.yml 2009-11-02 14:15:04.114372491 +0100
***************
*** 94,99 ****
--- 94,102 ----
default: 0
commit_fix_done_ratio:
default: 100
+ commit_logtime_enabled:
+ format: int
+ default: 0
# autologin duration in days
# 0 means autologin is disabled
autologin:
diff -crBx .git redmine-trunk/config/locales/pl.yml redmine-trunk-new/config/locales/pl.yml
*** redmine-trunk/config/locales/pl.yml 2009-11-02 14:27:14.457816133 +0100
--- redmine-trunk-new/config/locales/pl.yml 2009-11-02 15:41:08.203990720 +0100
***************
*** 853,858 ****
label_group_new: Nowa grupa
label_time_entry_plural: Spędzony czas
text_journal_added: "Dodano {{label}} {{value}}"
! field_active: Active
! enumeration_system_activity: System Activity
permission_delete_issue_watchers: Delete watchers
--- 853,861 ----
label_group_new: Nowa grupa
label_time_entry_plural: Spędzony czas
text_journal_added: "Dodano {{label}} {{value}}"
! field_active: Aktywne
! enumeration_system_activity: Aktywność Systemowa
permission_delete_issue_watchers: Delete watchers
+ setting_commit_logtime_enabled: Enable time logging
+ text_commit_logtime: "Allows to log time in commit messages. Examples: refs #123 @1.5 or refs #123 @1h30m or fixes #123 @1h 30m (logs one hour and 30 minutes for issue #123)"
+
diff -crBx .git redmine-trunk/config/locales/pt-BR.yml redmine-trunk-new/config/locales/pt-BR.yml
*** redmine-trunk/config/locales/pt-BR.yml 2009-11-02 14:27:14.457816133 +0100
--- redmine-trunk-new/config/locales/pt-BR.yml 2009-11-02 15:41:08.207883030 +0100
***************
*** 856,861 ****
label_group_new: Novo grupo
label_time_entry_plural: Tempos gastos
text_journal_added: "{{label}} {{value}} adicionado"
! field_active: Active
! enumeration_system_activity: System Activity
! permission_delete_issue_watchers: Delete watchers
--- 856,864 ----
label_group_new: Novo grupo
label_time_entry_plural: Tempos gastos
text_journal_added: "{{label}} {{value}} adicionado"
! field_active: Ativo
! enumeration_system_activity: Atividade do sistema
! permission_delete_issue_watchers: Deletar observadores
! setting_commit_logtime_enabled: Enable time logging
! text_commit_logtime: "Allows to log time in commit messages. Examples: refs #123 @1.5 or refs #123 @1h30m or fixes #123 @1h 30m (logs one hour and 30 minutes for issue #123)"
!
diff -crBx .git redmine-trunk/config/locales/zh-TW.yml redmine-trunk-new/config/locales/zh-TW.yml
*** redmine-trunk/config/locales/zh-TW.yml 2009-11-02 14:27:14.457816133 +0100
--- redmine-trunk-new/config/locales/zh-TW.yml 2009-11-02 15:41:08.281213374 +0100
***************
*** 919,924 ****
enumeration_issue_priorities: 項目優先權
enumeration_doc_categories: 文件分類
enumeration_activities: 活動 (時間追蹤)
! field_active: Active
! enumeration_system_activity: System Activity
! permission_delete_issue_watchers: Delete watchers
--- 922,928 ----
enumeration_issue_priorities: 項目優先權
enumeration_doc_categories: 文件分類
enumeration_activities: 活動 (時間追蹤)
! enumeration_system_activity: 系統活動
! setting_commit_logtime_enabled: Enable time logging
! text_commit_logtime: "Allows to log time in commit messages. Examples: refs #123 @1.5 or refs #123 @1h30m or fixes #123 @1h 30m (logs one hour and 30 minutes for issue #123)"
!