Mercurial > hg > soundsoftware-site

diff lib/redmine/.svn/text-base/i18n.rb.svn-base @ 246:eeebe205a056 cannam

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* Merge from default branch, bringing us up to SVN trunk rev 4993
author Chris Cannam
date Thu, 03 Mar 2011 12:02:03 +0000
parents 051f544170fe
children
line wrap: on
line diff
--- a/lib/redmine/.svn/text-base/i18n.rb.svn-base	Thu Jan 20 09:59:02 2011 +0000
+++ b/lib/redmine/.svn/text-base/i18n.rb.svn-base	Thu Mar 03 12:02:03 2011 +0000
@@ -45,8 +45,8 @@
       time = time.to_time if time.is_a?(String)
       zone = User.current.time_zone
       local = zone ? time.in_time_zone(zone) : (time.utc? ? time.localtime : time)
-      Setting.time_format.blank? ? ::I18n.l(local, :format => (include_date ? :default : :time)) : 
-                                   ((include_date ? "#{format_date(time)} " : "") + "#{local.strftime(Setting.time_format)}")
+      (include_date ? "#{format_date(local)} " : "") +
+        (Setting.time_format.blank? ? ::I18n.l(local, :format => :time) : local.strftime(Setting.time_format))
     end
 
     def day_name(day)