Merge pull request #214 from 0x0d/master

[etc/awesome.git] / widgets / calendar.lua

diff --git a/widgets/calendar.lua b/widgets/calendar.lua
index e1733ee82dec7af7785693d01d9e962f56ec6281..1a481cab64243a792c9c81fbabedf543d8244744 100644 (file)
--- a/widgets/calendar.lua
+++ b/widgets/calendar.lua
@@ -50,7 +50,7 @@ function calendar:show(t_out, inc_offset, scr)
         calendar.notify_icon = calendar.icons .. today .. ".png"
 
         -- bg and fg inverted to highlight today
         calendar.notify_icon = calendar.icons .. today .. ".png"
 
         -- bg and fg inverted to highlight today

-                         f = io.popen(calendar.cal_format(today))
+        f = io.popen(calendar.cal_format(today))

     else -- no current month showing, no day to highlight
        local month = tonumber(os.date('%m'))
        local year = tonumber(os.date('%Y'))
     else -- no current month showing, no day to highlight
        local month = tonumber(os.date('%m'))
        local year = tonumber(os.date('%Y'))


@@ -100,7 +100,7 @@ function calendar:attach(widget, args)
     local args = args or {}
 
     calendar.cal         = args.cal or "/usr/bin/cal"
     local args = args or {}
 
     calendar.cal         = args.cal or "/usr/bin/cal"

-    calendar.cal_format  = args.ca_format or function(today)
+    calendar.cal_format  = args.cal_format or function(today)

         return string.format("%s | sed -r -e 's/_\\x08//g' -e '0,/(^| )%d($| )/ s/(^| )%d($| )/\\1<b><span foreground=\"%s\" background=\"%s\">%d<\\/span><\\/b>\\2/'",
                              calendar.cal, today, today, calendar.bg, calendar.fg, today)
     end
         return string.format("%s | sed -r -e 's/_\\x08//g' -e '0,/(^| )%d($| )/ s/(^| )%d($| )/\\1<b><span foreground=\"%s\" background=\"%s\">%d<\\/span><\\/b>\\2/'",
                              calendar.cal, today, today, calendar.bg, calendar.fg, today)
     end