Изменения
Перейти к навигации
Перейти к поиску
Строка 669:
Строка 669: + Строка 675:
Строка 676: − + + − local jdate = {["year"]=purif(year), ["month"]=purif(month), ["day"]=purif(day)} + − local gdate = jd2gri(jul2jd(jdate)) Строка 690:
Строка 691: − +
дополнение
end
end
local cal = args[2]:lower() or "г"
local bc,wd,wm,wy,sq_brts =
local bc,wd,wm,wy,sq_brts =
is(args["bc"]),
is(args["bc"]),
is(args["wy"]),
is(args["wy"]),
is(args["sq_brts"])
is(args["sq_brts"])
local datein = {["year"]=purif(year), ["month"]=purif(month), ["day"]=purif(day)}
year = astroyear(purif(year),bc)
year = astroyear(purif(year),bc)
jdate, gdate = recalc(datein,cal)
local yearmark = "года"
local yearmark = "года"
else yearmark = trim(ym) or "года" end
else yearmark = trim(ym) or "года" end
end
end
return double_couple(jdate, gdate, wd, wm, wy, sq_brts, yearmark)
return double_couple(jdate, gdate, wd, wm, wy, sq_brts, yearmark)
end
end