diff --git a/modules/rice/waybar/waybar-wttr.py b/modules/rice/waybar/waybar-wttr.py index bc3a7ae..a55dfe5 100644 --- a/modules/rice/waybar/waybar-wttr.py +++ b/modules/rice/waybar/waybar-wttr.py @@ -66,7 +66,7 @@ def format_time(time): def format_temp(temp): - return (hour['FeelsLikeC']+"°").ljust(3) + return (hour['FeelsLikeF']+"°").ljust(3) def format_chances(hour): @@ -94,10 +94,10 @@ if tempint >= 0 and tempint < 10: data['text'] = ' '+WEATHER_CODES[weather['current_condition'][0]['weatherCode']] + \ - "\n "+extrachar+weather['current_condition'][0]['FeelsLikeC']+"°" + "\n "+extrachar+weather['current_condition'][0]['FeelsLikeF']+"°" -data['tooltip'] = f"{weather['current_condition'][0]['weatherDesc'][0]['value']} {weather['current_condition'][0]['temp_C']}°\n" -data['tooltip'] += f"Feels like: {weather['current_condition'][0]['FeelsLikeC']}°\n" +data['tooltip'] = f"{weather['current_condition'][0]['weatherDesc'][0]['value']} {weather['current_condition'][0]['temp_F']}°\n" +data['tooltip'] += f"Feels like: {weather['current_condition'][0]['FeelsLikeF']}°\n" data['tooltip'] += f"Wind: {weather['current_condition'][0]['windspeedKmph']}Km/h\n" data['tooltip'] += f"Humidity: {weather['current_condition'][0]['humidity']}%\n" for i, day in enumerate(weather['weather']): @@ -107,7 +107,7 @@ for i, day in enumerate(weather['weather']): if i == 1: data['tooltip'] += "Tomorrow, " data['tooltip'] += f"{day['date']}\n" - data['tooltip'] += f"⬆️ {day['maxtempC']}° ⬇️ {day['mintempC']}° " + data['tooltip'] += f"⬆️ {day['maxtempF']}° ⬇️ {day['mintempF']}° " data['tooltip'] += f"🌅 {day['astronomy'][0]['sunrise']} 🌇 {day['astronomy'][0]['sunset']}\n" for hour in day['hourly']: if i == 0: