Anonymous user
Module:Age: Difference between revisions
update from sandbox: dates can be "partial" consisting of ymd, ym or y (but yd is invalid); with an invalid date, show=format gives 'error' rather than a run-time error
(update from sandbox: sortable=table; ranges of more time units; no default sort key in Template:Age in years and days; implement Template:Birth date and age; experimental range=no) |
(update from sandbox: dates can be "partial" consisting of ymd, ym or y (but yd is invalid); with an invalid date, show=format gives 'error' rather than a run-time error) |
||
Line 206:
table.insert(parms, 'partial')
end
local show = stripToNil(args.show) or 'dmy'▼
local date = Date(unpack(parms))
if not date then
if show == 'format' then
return 'error'
end
return message('Need valid date')
end
Line 225 ⟶ 229:
prefix = makeSort(value, sortable)
end
▲ local show = stripToNil(args.show) or 'dmy'
if show ~= 'hide' then
result = date[show]
Line 237 ⟶ 240:
end
return (prefix or '') .. (result or '')
end
local function rangeJoin(range)
-- Return text to be used between a range of ages.
return range == 'dash' and '–' or ' or '
end
Line 256 ⟶ 264:
end
if islist then
else
vstr = fmt(v)
Line 417 ⟶ 424:
(textOptions.prefix or '') ..
makeText({ diff.partial.mindiff:age(show.id, diffOptions) }, show, names[abbr], opt) ..
rangeJoin(textOptions.range
makeText({ diff.partial.maxdiff:age(show.id, diffOptions) }, show, names[abbr], opt) ..
(textOptions.suffix or '')
Line 429 ⟶ 436:
-- * date1, date2 (two date tables, if not single)
-- * text (a string error message)
-- A missing date is optionally replaced with the current date.
-- If wantMixture is true, a missing date component is replaced
-- from the current date, so can get a bizarre mixture of
Line 436 ⟶ 443:
local Date, currentDate = getExports(frame)
getopt = getopt or {}
local fix = getopt.fix and 'fix' or ''▼
local partial = getopt.partial and 'partial' or ''▼
local args = frame:getParent().args
local fields = {}
Line 462 ⟶ 467:
end
end
▲ local fix = getopt.fix and 'fix' or ''
local noDefault = imax == 0 and getopt.noMissing
local dates = {}
if isNamed or imax >= 3 then
Line 477 ⟶ 484:
end
else
-- If partial dates are allowed, accept
-- year only, or
-- year and month only
-- Do not accept year and day without a month because that makes no sense
-- (and because, for example, Date('partial', 2001, nil, 12) sets day = nil, not 12).
for i = 1, nrDates do
local index = i == 1 and 1 or 4
local y, m, d = fields[index], fields[index+1], fields[index+2]
if (getopt.partial and y and (m or not d)) or (y and m and d) then
dates[i] = Date(fix,
elseif not y and not m and not d and not noDefault then
dates[i] = Date('currentdate')
Line 489 ⟶ 501:
elseif not noDefault then
getopt.textdates = true -- have parsed each date from a single text field
dates[1] = Date(fix,
if not getopt.single then
dates[2] = Date(fix,
end
end
Line 617 ⟶ 629:
end
end
local partial, autofill
local range = stripToNil(args.range) or spec.range
if range then
Line 623 ⟶ 635:
-- "|range=" (empty value) has no effect (spec is used).
-- "|range=yes" or spec.range == true sets range = true (gives "11 or 12")
-- "|range=dash" or spec.range == 'dash' sets range = 'dash' (gives "11–12").
-- "|range=no" or spec.range == 'no' sets range = nil and fills each date in the diff (gives "12").
--
-- "|range=OTHER" sets range = nil and rejects partial dates.
range = ({ dash = 'dash', off = 'no', no = 'no', [true] = true })[range] or yes(range)
if range then
partial = true -- accept partial dates with a possible age range for the result
if range == 'no' then
autofill = true -- missing month/day in first or second date are filled from other date or 1
range = nil
end
Line 653 ⟶ 664:
end
local parms = {
diff = date2:subtract(date1,
wantDuration = spec.duration or yes(args.duration),
range = range,
| |||