יחידה:תאריך עברי: הבדלים בין גרסאות בדף

→ העריכה הקודמת

@@ שורה 76: / שורה 76: @@
 			greg = same(greg .. " - ".. diffs .. "days")
 			checkcasp(greg)
+			if makeformat then
+				return frame:callParserFunction("#זמןמ:" .. makeformat, greg)
+			end
 			return format(greg) end
 		count = count + 1
@@ שורה 349: / שורה 352: @@
 function fromhebrew(f)
 	which = true
+	return fromhebrewandverify(f)
+end
+function fromhebrewformat(f)
+	which = true
+	makeformat = f.args["format"]
 	return fromhebrewandverify(f)
 end
@@ שורה 486: / שורה 495: @@
 --							.. frame.args["type"] .. " לועזי מדויק]]" end
 			return "" end
-	if hsuccess and wsuccess
+	if wsuccess and hsuccess
-		then if ht == "dmy" then return hdw
+		then if wt == "dmy" then return wdate
-			elseif wt == "dmy" then return wdate
+			elseif ht == "dmy" then return hdw
+			elseif wt == "my" then return wdate
 			elseif ht == "my" then return hdw
-			elseif wt == "my" then return wdate
+			elseif wt == "y" then return wdate
-			elseif ht == "y" then return hdw
+			else return hdw end
-			else return wdate end
+		elseif wsuccess then return wdate
 		elseif hsuccess then return hdw
-		elseif wsuccess then return wdate
+		elseif wt == "about" then return wdate
-		elseif ht == "about" then return hdate
+		else return hdate end
-		else return wdate end
 end
@@ שורה 602: / שורה 611: @@
 end
-return {fromhebrew = fromhebrew, tohebrew = tohebrew, verify = verify, pick = pick, samedate = samedate}
+return {fromhebrew = fromhebrew, tohebrew = tohebrew, verify = verify, pick = pick, samedate = samedate,
+	fromhebrewformat = fromhebrewformat}