אונטערשייד צווישן ווערסיעס פון "יחידה:אידישע דאטום"

חשוון > חשון
(נאך עטליכע טעותים)
(חשוון > חשון)
 
(3 צווישנדיגע ווערסיעס פונעם זעלבן באַניצער נישט געוויזן)
שורה 3: שורה 3:


monthtable = {
monthtable = {
["תשרי"] = 7, ["חשוון"] = 8, ["כסלו"] = 9, ["טבת"] = 10,
["תשרי"] = 7, ["חשון"] = 8, ["כסלו"] = 9, ["טבת"] = 10,
["שבט"] = 11, ["אדר א'"] = 12, ["אדר ב'"] = 13, ["אדר"] = 13,
["שבט"] = 11, ["אדר א'"] = 12, ["אדר ב'"] = 13, ["אדר"] = 13,
["ניסן"] = 1, ["אייר"] = 2, ["סיון"] = 3, ["תמוז"] = 4,
["ניסן"] = 1, ["אייר"] = 2, ["סיון"] = 3, ["תמוז"] = 4,
שורה 10: שורה 10:


typomonthtable = {
typomonthtable = {
["חשון"] = "חשוון",
["חשוון"] = "חשון",
["כסליו"] = "כסלו",
["כסליו"] = "כסלו",
["סיוון"] = "סיון",
["סיוון"] = "סיון",
["מרחשון"] = "חשוון",
["מרחשון"] = "חשון",
["מרחשוון"] = "חשוון",  
["מרחשוון"] = "חשון",  
["מר-חשוון"] = "חשוון",
["מר-חשוון"] = "חשון",
["מנחם אב"] = "אב",
["מנחם אב"] = "אב",
["מנחם-אב"] = "אב",
["מנחם-אב"] = "אב",
שורה 57: שורה 57:
function mindate(fix)
function mindate(fix)
local indenttable = {176, 206, 235, 265, 294, 324, 0, 30, 59, 88, 117, 147, 147}
local indenttable = {176, 206, 235, 265, 294, 324, 0, 30, 59, 88, 117, 147, 147}
return same("28-08-" .. takeyear(fix[3]) .. " + " .. (indenttable[monthtable[sub1(fix[2], 2)]]
return same("28-08-" .. takeyear(fix[3]) .. " + " .. (indenttable[monthtable[sub1(fix[2], 1)]]
+ hebnum(fix[1]) - 1) .. " days")
+ hebnum(fix[1]) - 1) .. " days")
end
end
שורה 157: שורה 157:
local year = makeyear(gdate)
local year = makeyear(gdate)
if frame.args["links"] == "yes"
if frame.args["links"] == "yes"
then return "[[" .. frame:callParserFunction("#זמןמ:j F", gdate) .. "]] [["
then return "[[" .. frame:callParserFunction("#זמןמ:F j", gdate) .. "]] [["
.. year .. "]]" end
.. year .. "]]" end
return frame:callParserFunction("#זמןמ:j F", gdate) .. " " .. year
return frame:callParserFunction("#זמןמ:F j", gdate) .. " " .. year
end
end


שורה 404: שורה 404:
function tohebrewmonth(wdate)
function tohebrewmonth(wdate)
if frame.args["exact"] == "כן"
if frame.args["exact"] == "כן"
then return tohebrewdate("15טן " .. wdate, frommonth) end
then return tohebrewdate("15 " .. wdate, frommonth) end
local date1 = tohebrewdate("1טן " .. wdate, same)
local date1 = tohebrewdate("1 " .. wdate, same)
local month1 = fromonlymonth(date1)
local month1 = fromonlymonth(date1)
local year1 = fromyear(date1)
local year1 = fromyear(date1)
local date2 = same(date1 .. " + 31 days")
local date2 = same(date1 .. " + 31 days")
date2 = tomonth(date2)
date2 = tomonth(date2)
date2 = tohebrewdate("1טן " .. date2, same)
date2 = tohebrewdate("1 " .. date2, same)
date2 = same(date2 .. " - 1 days")
date2 = same(date2 .. " - 1 days")
local month2 = fromonlymonth(date2)
local month2 = fromonlymonth(date2)