X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=data%2Frbot%2Fplugins%2Ftime.rb;h=4e7543c8be2317a0f6fc78f191602509985c4d0f;hb=58e65601becf1d3a1febf1d6067cd66754711c8b;hp=96b101ce68e32f95f6701f42da545afbee5deb48;hpb=edd1cf77be07ae507014574141e920ad23eb164d;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git

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