From: 2009 <justin.endacott@gmail.com>
Date: Wed, 1 Feb 2017 09:08:55 +0000 (+1000)
Subject: Fix calender widget not highlighting date
X-Git-Url: https://git.madduck.net/etc/awesome.git/commitdiff_plain/91569eb5b4ffb200f3f68baaabcd42af32d13674?ds=inline;hp=-c

Fix calender widget not highlighting date

- os.date was returning the day as 01 which meant the calendar icon was looking for 01.png instead of 1.png
- looks like the cal command pads the singe didgets which the gsub didn't account for
---

91569eb5b4ffb200f3f68baaabcd42af32d13674
diff --git a/widgets/calendar.lua b/widgets/calendar.lua
index 17fc45d..ef6c5e7 100644
--- a/widgets/calendar.lua
+++ b/widgets/calendar.lua
@@ -38,7 +38,7 @@ function calendar.show(t_out, inc_offset, scr)
 
     if current_month then -- today highlighted
         calendar.offset = 0
-        calendar.notify_icon = string.format("%s%s.png", calendar.icons, today)
+        calendar.notify_icon = string.format("%s%s.png", calendar.icons, tonumber(today))
         f = calendar.cal
     else -- no current month showing, no day to highlight
        local month = tonumber(os.date("%m"))
@@ -68,7 +68,7 @@ function calendar.show(t_out, inc_offset, scr)
 
     helpers.async(f, function(ws)
         fg, bg = calendar.notification_preset.fg, calendar.notification_preset.bg
-        ws = ws:gsub("%c%[%d+[m]?%d+%c%[%d+[m]?", markup.bold(markup.color(bg, fg, today)))
+        ws = ws:gsub("%c%[+%d+[m]?%s?%d+%c%[+%d+[m]?", markup.bold(markup.color(bg, fg, today:gsub("^0", " "))))
         calendar.hide()
         calendar.notification = naughty.notify({
             preset      = calendar.notification_preset,