Lots of fixes, changes, and new goodies.

This commit is contained in:
Sean B. Palmer
2008-02-23 12:16:43 +00:00
parent 7931fab145
commit 2fb0058943
13 changed files with 94 additions and 40 deletions

View File

@@ -187,7 +187,7 @@ TimeZones.update(TZ1)
@deprecated
def f_time(self, origin, match, args):
""".t [ <timezone> ] - Returns the current time"""
tz = match.group(1) or 'GMT'
tz = match.group(2) or 'GMT'
# Personal time zones, because they're rad
if hasattr(self.config, 'timezones'):
@@ -196,7 +196,7 @@ def f_time(self, origin, match, args):
if People.has_key(tz):
tz = People[tz]
elif (not match.group(1)) and People.has_key(origin.nick):
elif (not match.group(2)) and People.has_key(origin.nick):
tz = People[origin.nick]
TZ = tz.upper()