ChCh/CloudBot
Archived
11
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'develop' of https://github.com/ClouDev/CloudBot into develop

Browse source
This commit is contained in:
Luke Rogers 2013-02-13 17:40:20 +13:00
commit 072e73f3a1
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
plugins/weather.py
View file

@ -123,11 +123,11 @@ def weather(inp, nick="", reply=None, db=None, notice=None):
reply("\x02{place}\x02 - \x02Current:\x02 {conditions}, {temp_f}F/{temp_c}C, Humidity: {humidity}%, " \ reply("\x02{place}\x02 - \x02Current:\x02 {conditions}, {temp_f}F/{temp_c}C, Humidity: {humidity}%, " \
"Wind: {wind_kph}KPH/{wind_mph}MPH {wind_text}, \x02Today:\x02 {forecast}, " \ "Wind: {wind_kph}KPH/{wind_mph}MPH {wind_text}, \x02Today:\x02 {forecast}, " \
"High: {high_f}F/{high_c}C, Low: {low_f}F/{low_c}C." \ "High: {high_f}F/{high_c}C, Low: {low_f}F/{low_c}C. " \
"\x02Tomorrow:\x02 {_forecast}, High: {_high_f}F" \ "\x02Tomorrow:\x02 {_forecast}, High: {_high_f}F" \
"/{_high_c}C, Low: {_low_f}F/{_low_c}C.".format(**weather_data)) "/{_high_c}C, Low: {_low_f}F/{_low_c}C.".format(**weather_data))
if location and not dontsave: if location and not dontsave:
db.execute("insert or replace into weather(nick, loc) values (?,?)", db.execute("insert or replace into weather(nick, loc) values (?,?)",
(nick.lower(), location)) (nick.lower(), location))
db.commit() db.commit()