Generalize month/year length

master
Wuzzy 2020-08-27 02:26:34 +02:00
parent 3628007ecd
commit 2a3b345417
1 changed files with 5 additions and 6 deletions

View File

@ -17,8 +17,7 @@ calendar.month_names_short = { S('Jan'), S('Feb'), S('Mar'), S('Apr'), S('May'),
--calendar.month_names_short = { S('Spr'), S('Sum'), S('Har'), S('Win') }
calendar.MONTHS = #calendar.month_names
calendar.month_lengths = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }
--calendar.month_lengths = { 30, 30, 30, 30 }
calendar.YEAR_DAYS = calendar.MONTHS * calendar.MONTH_DAYS
-- Week day names
calendar.weekday_names = { S("Monday"), S("Tuesday"), S("Wednesday"), S("Thursday"), S("Friday"), S("Saturday"), S("Sunday") }
@ -78,10 +77,10 @@ calendar.get_date = function(days, ordinal)
days = minetest.get_day_count()
end
local y = math.floor( days / 360 ) -- elapsed years in epoch
local m = math.floor( days % 360 / 30 ) -- elapsed months in year
local d = math.floor( days % 360 % 30 ) -- elapsed days in month
local j = math.floor( days % 360 ) -- elapsed days in year
local y = math.floor( days / calendar.YEAR_DAYS ) -- elapsed years in epoch
local m = math.floor( days % calendar.YEAR_DAYS / calendar.MONTH_DAYS ) -- elapsed months in year
local d = math.floor( days % calendar.YEAR_DAYS % calendar.MONTH_DAYS ) -- elapsed days in month
local j = math.floor( days % calendar.YEAR_DAYS ) -- elapsed days in year
if ordinal == nil then
ordinal = false