Merge remote-tracking branch 'upstream/master'

diff --cc widgets/weather.lua
index cd8f6abbc8cde1c69302d074418dcef45b6fa003,7ff498add77fea70203339e92d0d12cfa179b43b..6143ca57a0e09578927cd035f51812972354fabc
--- 1/widgets/weather.lua
--- 2/widgets/weather.lua
+++ b/widgets/weather.lua
@@@ -70,12 -73,9 +73,8 @@@ local function worker(args
              weather.forecast_update()
          end
  
-         if not weather.current_text then
-             weather.update()
-         end
--
          weather.notification = naughty.notify({
 -            text    = weather.notification_text,
 +            text    = weather.current_text .. weather.notification_text,
              icon    = weather.icon_path,
              timeout = t_out,
              preset  = notification_preset
@@@ -121,22 -121,25 +120,26 @@@
      function weather.update()
          local cmd = string.format(current_call, city_id, units, lang, APPID)
          async.request(cmd, function(f)
-             local pos, err, sunrise, sunset, current_dt, datetime, icon
+             local pos, err, icon
              weather_now, pos, err = json.decode(f, 1, nil)
 -
 +            weather.current_text=''
              if not err and weather_now and tonumber(weather_now["cod"]) == 200 then
-                 current_dt = os.time()
-                 sunrise = weather_now["sys"]["sunrise"]
-                 sunset  = weather_now["sys"]["sunset"]
-                 if current_dt > sunrise and current_dt < sunset then 
-                     datetime="d"
+                 -- weather icon based on localtime
+                 now     = os.time() - (utc * 3600)
+                 sunrise = tonumber(weather_now["sys"]["sunrise"])
+                 sunset  = tonumber(weather_now["sys"]["sunset"])
+                 icon    = weather_now["weather"][1]["icon"]
+ 
+                 if sunrise <= now and now <= sunset then
+                     icon = string.gsub(icon, "n", "d")
                  else
-                     datetime="n"
+                     icon = string.gsub(icon, "d", "n")
                  end
-                 icon = weather_now["weather"][1]["icon"]
-                 weather.icon_path = icons_path .. icon:sub(1,2) .. datetime .. ".png"
+ 
+                 weather.icon_path = icons_path .. icon .. ".png"
+ 
                  widget = weather.widget
 +                weather.current_text = "Now:" .. weather_now["weather"][1]["description"] .. "\n"
                  settings()
              else
                  weather.icon_path = icons_path .. "na.png"