widget.calendar: some cleaning; #379

diff --git a/widget/calendar.lua b/widget/calendar.lua
index 84b025d5d9b5f707fecf4c0a4b551fc4bc566e20..e7b330ad4282c9825277df0737d187ac0a03ee2e 100644 (file)
--- a/widget/calendar.lua
+++ b/widget/calendar.lua
@@ -10,9 +10,8 @@ local markup       = require("lain.util.markup")
 local awful        = require("awful")
 local naughty      = require("naughty")
 local mouse        = mouse
 local awful        = require("awful")
 local naughty      = require("naughty")
 local mouse        = mouse

-local os           = { date   = os.date }
-local string       = { format = string.format,
-                       gsub   = string.gsub }
+local os           = os
+local string       = string

 local ipairs       = ipairs
 local tonumber     = tonumber
 local setmetatable = setmetatable
 local ipairs       = ipairs
 local tonumber     = tonumber
 local setmetatable = setmetatable


@@ -40,10 +39,8 @@ function calendar.show(t_out, inc_offset, scr)
         calendar.icon   = calendar.icons:len() > 0 and string.format("%s%s.png", calendar.icons, tonumber(os.date("%d")))
         f               = calendar.cal
     else -- no current month showing, no day to highlight
         calendar.icon   = calendar.icons:len() > 0 and string.format("%s%s.png", calendar.icons, tonumber(os.date("%d")))
         f               = calendar.cal
     else -- no current month showing, no day to highlight

-       local month = tonumber(os.date("%m"))

        local year  = tonumber(os.date("%Y"))
        local year  = tonumber(os.date("%Y"))

-
-       month = month + calendar.offset
+       local month = tonumber(os.date("%m")) + calendar.offset

 
        while month > 12 do
            month = month - 12
 
        while month > 12 do
            month = month - 12

diff --git a/wiki b/wiki
index 2268c893712e579f1b68f25be8ff9caf9767312f..89f3d98e339f07545aec31e94a3ecf42245b6316 160000 (submodule)
--- a/wiki
+++ b/wiki
@@ -1 +1 @@
-Subproject commit 2268c893712e579f1b68f25be8ff9caf9767312f
+Subproject commit 89f3d98e339f07545aec31e94a3ecf42245b6316