From fd83bd02e2b82457e0a49214e075173505ebe994 Mon Sep 17 00:00:00 2001 From: Giuseppe Bilotta Date: Tue, 16 Dec 2008 01:25:03 +0100 Subject: utils.rb: fix Utils.timeago for explicit date output --- lib/rbot/core/utils/utils.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/rbot/core/utils/utils.rb b/lib/rbot/core/utils/utils.rb index 864426b0..5af26b69 100644 --- a/lib/rbot/core/utils/utils.rb +++ b/lib/rbot/core/utils/utils.rb @@ -244,7 +244,7 @@ module ::Irc # :date_format, used with to_formatted_s, default to :default def Utils.timeago(time, options = {}) start_date = options.delete(:start_date) || Time.new - date_format = options.delete(:date_format) || :default + date_format = options.delete(:date_format) || "%x" delta_minutes = (start_date.to_i - time.to_i).floor / 60 if delta_minutes.abs <= (8724*60) # eight weeks? I'm lazy to count days for longer than that distance = Utils.distance_of_time_in_words(delta_minutes); @@ -254,7 +254,7 @@ module ::Irc _("%{d} ago") % {:d => distance} end else - return _("on %{date}") % {:date => system_date.to_formatted_s(date_format)} + return _("on %{date}") % {:date => time.strftime(date_format)} end end # Translates a number of minutes into verbal distances. -- cgit v1.2.3