Изменения
дополнение
day, month, year = strin:match( "(%d+)%.(%d+)%.(-?%d+)" )
day, month, year = strin:match( "(%d+)%.(%d+)%.(-?%d+)" )
end
end
if not year then return error(args[1] .. " не подходит под форматы yyyy-mm-dd или dd.mm.yyyy")
if not year then return error(args[1] .. " is not a yyyy-mm-dd or dd.mm.yyyy format")
end
end
local jdate = {["year"]=purif(year), ["month"]=purif(month), ["day"]=purif(day)}
local jdate = {["year"]=purif(year), ["month"]=purif(month), ["day"]=purif(day)}
local yearmark = "года"
local yearmark = "года"
local ym = args["yearmark"]
elseif yesno(args["yearmark"]) == false then yearmark = ""
if yesno(ym) then
else yearmark = trim(args["yearmark"]) or "года" end
elseif yesno(ym) == false then yearmark = ""
else
if not not ym:match("(%d+)") then
error("Цифры в обозначении года: " .. ym)
else yearmark = trim(ym) or "года" end
end
return double_couple(jdate, gdate, wd, wm, wy, sq_brts, yearmark)
return double_couple(jdate, gdate, wd, wm, wy, sq_brts, yearmark)