From 4fe565dbca35a0fd9de92feb46c783e3b2970232 Mon Sep 17 00:00:00 2001
From: Ian Alexander Monroe <imonroe@kde.org>
Date: Fri, 20 Jun 2008 11:52:28 -0400
Subject: made the time plugin have more pretty output, show real timezone
 abbr. instead of "UTC" all the time

---
 data/rbot/plugins/time.rb | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'data')

diff --git a/data/rbot/plugins/time.rb b/data/rbot/plugins/time.rb
index 96b101ce..4e7543c8 100644
--- a/data/rbot/plugins/time.rb
+++ b/data/rbot/plugins/time.rb
@@ -52,18 +52,19 @@ class TimePlugin < Plugin
             zone = arr.join( sp )
         }
     
-    TZInfo::Timezone.get( zone ).now
+    tz = TZInfo::Timezone.get( zone )
+    "#{tz.friendly_identifier} - #{tz.now.strftime( '%a %b %d %H:%M' )} #{tz.current_period.abbreviation}"
   end
 
   def showTime(m, params)
     zone = params[:where].join('_')
     if params[:where].size > 0 then
       begin
-        m.reply "#{zone} - #{getTime( m,  zone )}"
+        m.reply getTime( m,  zone )
       rescue TZInfo::InvalidTimezoneIdentifier
         if @registry.has_key?( zone ) then
           zone =  @registry[ zone ]
-          m.reply "#{zone} - #{getTime( m,  zone )}"
+          m.reply getTime( m,  zone )
         else
           m.reply "#{zone} is an unknown time."
         end
@@ -71,7 +72,7 @@ class TimePlugin < Plugin
     else
       if @registry.has_key?( m.sourcenick) then
         zone = @registry[ m.sourcenick ]
-        m.reply "#{m.sourcenick}: #{zone} - #{getTime( m,  zone )}"
+        m.reply "#{m.sourcenick}: #{getTime( m,  zone )}"
       else
         m.reply "#{m.sourcenick}: use time set <Continent/City> to set your timezone."
       end
-- 
cgit v1.2.3