Modulo:Datoj: Malsamoj inter versioj

[kontrolita revizio][kontrolita revizio]
Enhavo forigita Enhavo aldonita
forigu troan spacon
aktualigo laŭ la proveja modulo datoj/provejo
Linio 1:
-- modulo Datoj -- 20172020-0804-1415
-- ĉi tiu modulo celas plibonigi la jenajn ŝablonojn:
-- {{dato}},
Linio 202:
-- t = tago, m = monato, j = jaro
function p._dato(t,m,j,ar,ligilo)
if t ~= "" and m == "" and j == "" then
local count = 0
for eachMatch in t:gmatch("-") do count = count + 1 end
 
local pos, arr = 0, {}
for st,sp in function() return string.find(t,"-",pos,true) end do
table.insert(arr,string.sub(t,pos,st-1))
pos = sp + 1
end
table.insert(arr,string.sub(t,pos))
 
if count == 0 then
--return p._dato("", "", arr[1])
t = ""
m = ""
j = arr[1]
elseif count == 1 then
--return p._dato("", arr[2], arr[1])
t = ""
m = arr[2]
j = arr[1]
elseif count > 1 then
--return p._dato(arr[3], arr[2], arr[1])
t = arr[3]
m = arr[2]
j = arr[1]
end
end
-- ar - artikolo aŭ io tia
if ar == "" or ar == nil then
Linio 294 ⟶ 324:
-- t = tago, m = monato, j = jaro
function p._daton(t,m,j,ar,ligilo)
if t ~= "" and m == "" and j == "" then
local count = 0
for eachMatch in t:gmatch("-") do count = count + 1 end
 
local pos, arr = 0, {}
for st,sp in function() return string.find(t,"-",pos,true) end do
table.insert(arr,string.sub(t,pos,st-1))
pos = sp + 1
end
table.insert(arr,string.sub(t,pos))
 
if count == 0 then
--return p._daton("", "", arr[1])
t = ""
m = ""
j = arr[1]
elseif count == 1 then
--return p._daton("", arr[2], arr[1])
t = ""
m = arr[2]
j = arr[1]
elseif count > 1 then
--return p._daton(arr[3], arr[2], arr[1])
t = arr[3]
m = arr[2]
j = arr[1]
end
end
-- ar - artikolo aŭ io tia
if ar == "" or ar == nil then
Linio 439 ⟶ 499:
local r = ""
local mikro = "" -- mikroformato
local ar = "la "
a = mw.ustring.lower(a)
if a == "yes" or a == "jes" or a == "" then
Linio 571 ⟶ 631:
local ar = args["ar"] or pargs["ar"] or ""
local ligilo = args["ligilo"] or pargs["ligilo"] or ""
 
if arg1 ~= "" and arg2 == "" and arg3 == "" then
local count = 0
for eachMatch in arg1:gmatch("-") do count = count + 1 end
 
local pos, arr = 0, {}
for st,sp in function() return string.find(arg1,"-",pos,true) end do
table.insert(arr,string.sub(arg1,pos,st-1))
pos = sp + 1
end
table.insert(arr,string.sub(arg1,pos))
 
if count == 0 then
return p._dato("", "", arr[1])
elseif count == 1 then
return p._dato("", arr[2], arr[1])
elseif count > 1 then
return p._dato(arr[3], arr[2], arr[1])
end
end
 
return p._dato(arg1, arg2, arg3, ar, ligilo)
Linio 605 ⟶ 644:
local ar = args["ar"] or pargs["ar"] or ""
local ligilo = args["ligilo"] or pargs["ligilo"] or ""
 
if arg1 ~= "" and arg2 == "" and arg3 == "" then
local count = 0
for eachMatch in arg1:gmatch("-") do count = count + 1 end
 
local pos, arr = 0, {}
for st,sp in function() return string.find(arg1,"-",pos,true) end do
table.insert(arr,string.sub(arg1,pos,st-1))
pos = sp + 1
end
table.insert(arr,string.sub(arg1,pos))
 
if count == 0 then
return p._daton("", "", arr[1])
elseif count == 1 then
return p._daton("", arr[2], arr[1])
elseif count > 1 then
return p._daton(arr[3], arr[2], arr[1])
end
end
 
return p._daton(arg1, arg2, arg3, ar, ligilo)