awesomewm-mirrors
/
lain
mirror of https://github.com/lcpz/lain.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

widget.cal: fix week numbers (#501) 

widget.cal: fix week numbers; closes #487
This commit is contained in:
MarcinM 2021-03-31 12:19:10 +02:00 committed by GitHub
parent a955bbb2a9
commit 5882000904
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
widget/cal.lua
View File

@ -38,7 +38,15 @@ local function factory(args)
} }
function cal.get_week_number(m, st_day, x) function cal.get_week_number(m, st_day, x)
return string.format(cal.week_number_format, os.date("%V", m) + (x ~= 0 and floor((x + st_day) / 7) - 1 or 0)) local date = os.date("*t", m)
local week_step = (x ~= 0 and floor((x + st_day) / 7) - 1 or 0);
local display_time = os.time {
year = date.year, month = date.month, day = date.day + 7 * week_step
}
return string.format(cal.week_number_format, os.date("%V", display_time))
end end
function cal.sum_week_days(x, y) function cal.sum_week_days(x, y)
@ -69,7 +77,7 @@ local function factory(args)
cal.month, cal.year = d.month, d.year cal.month, cal.year = d.month, d.year
if cal.week_number ~= "none" then if cal.week_number ~= "none" then
local m = os.time { year = year or current_year, month = month and month or current_month, day = 0 } local m = os.time { year = year or current_year, month = month and month or current_month, day = 1 }
local head_prepend = string.rep(" ", tostring(string.format(cal.week_number_format, 0)):len()) local head_prepend = string.rep(" ", tostring(string.format(cal.week_number_format, 0)):len())
if cal.week_number == "left" then if cal.week_number == "left" then