From f9aff27534df2efe64d50c01864925f6fe4cd746 Mon Sep 17 00:00:00 2001 From: "Sean B. Palmer" Date: Sun, 28 Dec 2008 09:42:48 +0000 Subject: [PATCH] Minor bug fixes. --- modules/clock.py | 10 ++++++++-- modules/etymology.py | 2 +- modules/oblique.py | 8 ++++++-- modules/wikipedia.py | 2 +- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/modules/clock.py b/modules/clock.py index 59c9eb1..d1983ce 100755 --- a/modules/clock.py +++ b/modules/clock.py @@ -135,7 +135,7 @@ TZ2 = { 'HST': 10, 'IDLE': -12, 'IDLW': 12, - 'IST': -5.5, + # 'IST': -5.5, 'IT': -3.5, 'JST': -9, 'JT': -7, @@ -181,8 +181,14 @@ TZ2 = { 'ZP6': -6 } -TimeZones.update(TZ2) +TZ3 = { + 'AEST': 10, + 'AEDT': 11 +} + +# TimeZones.update(TZ2) # do these have to be negated? TimeZones.update(TZ1) +TimeZones.update(TZ3) @deprecated def f_time(self, origin, match, args): diff --git a/modules/etymology.py b/modules/etymology.py index 430e18e..12da548 100755 --- a/modules/etymology.py +++ b/modules/etymology.py @@ -22,7 +22,7 @@ abbrs = [ 'cf', 'lit', 'etc', 'Ger', 'Du', 'Skt', 'Rus', 'Eng', 'Amer.Eng', 'Sp', 'Fr', 'N', 'E', 'S', 'W', 'L', 'Gen', 'J.C', 'dial', 'Gk', '19c', '18c', '17c', '16c', 'St', 'Capt', 'obs', 'Jan', 'Feb', 'Mar', - 'Apr', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec', 'c' + 'Apr', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec', 'c', 'tr' ] t_sentence = r'^.*?(?