mirror of
https://github.com/Mikaela/Limnoria.git
synced 2024-11-30 06:49:24 +01:00
Current temperature *in*, not *at*.
This commit is contained in:
parent
aeda0833d2
commit
544bfa35da
@ -273,7 +273,7 @@ class Weather(callbacks.Privmsg):
|
|||||||
if temp and conds and city and state:
|
if temp and conds and city and state:
|
||||||
conds = conds.replace('Tsra', 'Thunderstorms')
|
conds = conds.replace('Tsra', 'Thunderstorms')
|
||||||
conds = conds.replace('Ts', 'Thunderstorms')
|
conds = conds.replace('Ts', 'Thunderstorms')
|
||||||
s = 'The current temperature at %s, %s is %s%s. Conditions: %s.'% \
|
s = 'The current temperature in %s, %s is %s%s. Conditions: %s.'% \
|
||||||
(city, state, temp, index, conds)
|
(city, state, temp, index, conds)
|
||||||
irc.reply(s)
|
irc.reply(s)
|
||||||
else:
|
else:
|
||||||
@ -332,7 +332,7 @@ class Weather(callbacks.Privmsg):
|
|||||||
temp = self._getTemp(int(temp), deg, unit, msg.args[0])
|
temp = self._getTemp(int(temp), deg, unit, msg.args[0])
|
||||||
else:
|
else:
|
||||||
temp = deg.join((temp, unit))
|
temp = deg.join((temp, unit))
|
||||||
resp = ['The current temperature at %s is %s.' % (location, temp)]
|
resp = ['The current temperature in %s is %s.' % (location, temp)]
|
||||||
if conds is not None:
|
if conds is not None:
|
||||||
resp.append('Conditions: %s.' % conds.group(1))
|
resp.append('Conditions: %s.' % conds.group(1))
|
||||||
if humidity is not None:
|
if humidity is not None:
|
||||||
@ -407,7 +407,7 @@ class Weather(callbacks.Privmsg):
|
|||||||
time = ' (%s)' % time.group(1)
|
time = ' (%s)' % time.group(1)
|
||||||
else:
|
else:
|
||||||
time = ''
|
time = ''
|
||||||
resp = ['The current temperature at %s is %s%s.' %\
|
resp = ['The current temperature in %s is %s%s.' %\
|
||||||
(location, temp, time)]
|
(location, temp, time)]
|
||||||
heat = self._wunderHeat.search(text)
|
heat = self._wunderHeat.search(text)
|
||||||
if heat is not None:
|
if heat is not None:
|
||||||
|
Loading…
Reference in New Issue
Block a user