X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/d352d807542aa221da7774d03a700cc596a09ba7..4903782e553dd8d16ae0ff5eab6c60886a52b673:/widgets/yawn/init.lua

diff --git a/widgets/yawn/init.lua b/widgets/yawn/init.lua
index 3f08cd5..148f547 100644
--- a/widgets/yawn/init.lua
+++ b/widgets/yawn/init.lua
@@ -36,7 +36,7 @@ local localizations_path  = project_path .. 'localizations/'
 local icon_path           = project_path .. 'icons/'
 local api_url             = 'http://weather.yahooapis.com/forecastrss'
 local units_set           = '?u=c&w=' -- Default is Celsius
-local language            = string.match(os.getenv("LANG"), "(%S*$*)[.]")
+local language            = string.match(os.getenv("LANG"), "(%S*$*)[.]") or "en_US" -- if LANG is not set
 local weather_data        = nil
 local notification        = nil
 local city_id             = nil
@@ -48,7 +48,7 @@ yawn_notification_preset = {}
 local function fetch_weather()
     local url = api_url .. units_set .. city_id
     local f = io.popen("curl --connect-timeout 1 -fsm 3 '" .. url .. "'" )
-    local text = f:read("*all")
+    local text = f:read("*a")
     f:close()
 
     -- In case of no connection or invalid city ID
@@ -135,7 +135,8 @@ local function fetch_weather()
     yawn.icon:set_image(sky)
     widget = yawn.widget
 
-    forecast = weather_data:match(": %S.-,"):gsub(": ", ""):gsub(",", "")
+    _data = weather_data:match(": %S.-,") or weather_data
+    forecast = _data:gsub(": ", ""):gsub(",", "")
     units = units:gsub(" ", "")
 
     settings()
@@ -160,7 +161,8 @@ function yawn.show(t_out)
         preset = yawn_notification_preset,
         text = weather_data,
         icon = sky,
-        timeout = t_out
+        timeout = t_out,
+        screen = client.focus and client.focus.screen or 1
     })
 end