revert #36; fix #41

[etc/awesome.git] / widgets / yawn / init.lua

diff --git a/widgets/yawn/init.lua b/widgets/yawn/init.lua
index b4d9c058dfa1f177641595717b85c8fb3608e243..86a2d0fe2979f38cf1acd8ca481cd161c441f424 100644 (file)
--- a/widgets/yawn/init.lua
+++ b/widgets/yawn/init.lua
@@ -58,12 +58,12 @@ local function fetch_weather()
         yawn.icon:set_image(icon_path .. "na.png")
         if text == "" then
             weather_data = "Service not available at the moment."
         yawn.icon:set_image(icon_path .. "na.png")
         if text == "" then
             weather_data = "Service not available at the moment."

-            yawn.widget:set_text(" N/A")
+            yawn.widget:set_text(" N/A ")

         else
             weather_data = "City not found!\n" ..
                            "Are you sure " .. city_id ..
                            " is your Yahoo city ID?"
         else
             weather_data = "City not found!\n" ..
                            "Are you sure " .. city_id ..
                            " is your Yahoo city ID?"

-            yawn.widget:set_text(" ?")
+            yawn.widget:set_text(" ? ")

         end
         return
     end
         end
         return
     end


@@ -75,7 +75,7 @@ local function fetch_weather()
     -- may still happens in case of bad connectivity
     if weather_data == "" then
         yawn.icon:set_image(icon_path .. "na.png")
     -- may still happens in case of bad connectivity
     if weather_data == "" then
         yawn.icon:set_image(icon_path .. "na.png")

-        yawn.widget:set_text(" ?")
+        yawn.widget:set_text(" ? ")

         return
     end
 
         return
     end
 


@@ -135,7 +135,8 @@ local function fetch_weather()
     yawn.icon:set_image(sky)
     widget = yawn.widget
 
     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()
     units = units:gsub(" ", "")
 
     settings()