Module:Age: Difference between revisions

3,791 bytes added ,  6 years ago
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
m (Protected "Module:Age": High-risk Lua module; 1,000+ transclusions ([Edit=Require autoconfirmed or confirmed access] (indefinite)))
(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)
Line 1: Line 1:
-- Implement various "age of" and other date-related templates.
-- Implement various "age of" and other date-related templates.


local _Date, _current_date
local _Date, _currentDate
local function get_exports(frame)
local function getExports(frame)
-- Return objects exported from the date module or its sandbox.
-- Return objects exported from the date module or its sandbox.
if not _Date then
if not _Date then
Line 8: Line 8:
local datemod = require('Module:Date' .. sandbox)
local datemod = require('Module:Date' .. sandbox)
_Date = datemod._Date
_Date = datemod._Date
_current_date = datemod._current
_currentDate = datemod._current
end
end
return _Date, _current_date
return _Date, _currentDate
end
end


local function collection()
local Collection  -- a table to hold items
-- Return a table to hold items.
Collection = {
return {
add = function (self, item)
n = 0,
if item ~= nil then
add = function (self, item)
self.n = self.n + 1
self.n = self.n + 1
self[self.n] = item
self[self.n] = item
end,
end
join = function (self, sep)
end,
return table.concat(self, sep)
join = function (self, sep)
end,
return table.concat(self, sep)
}
end,
end
remove = function (self, pos)
if self.n > 0 and (pos == nil or (0 < pos and pos <= self.n)) then
self.n = self.n - 1
return table.remove(self, pos)
end
end,
sort = function (self, comp)
table.sort(self, comp)
end,
new = function ()
return setmetatable({n = 0}, Collection)
end
}
Collection.__index = Collection


local function strip_to_nil(text)
local function stripToNil(text)
-- If text is a string, return its trimmed content, or nil if empty.
-- If text is a string, return its trimmed content, or nil if empty.
-- Otherwise return text (which may, for example, be nil).
-- Otherwise return text (which may, for example, be nil).
Line 43: Line 55:
end
end


local function message(msg, nocat)
local function message(msg, id)
-- Return formatted message text for an error.
-- Return formatted message text for an error or warning.
-- Can append "#FormattingError" to URL of a page with a problem to find it.
local categories = {
local anchor = '<span id="FormattingError"></span>'
error = '[[Category:Age error]]',
local category
warning = '[[Category:Age error]]',  -- same as error until determine whether 'Age warning' would be worthwhile
if not nocat and mw.title.getCurrentTitle():inNamespaces(0, 10) then
}
-- Category only in namespaces: 0=article, 10=template.
local a, b, category
category = '[[Category:Age error]]'
if id == 'warning' then
a = '<sup>[<i>'
b = '</i>]</sup>'
else
else
category = ''
a = '<strong class="error">Error: '
b = '</strong>'
end
if mw.title.getCurrentTitle():inNamespaces(0) then
-- Category only in namespaces: 0=article.
category = categories[id or 'error']
end
end
return anchor ..
return
'<strong class="error">Error: ' ..
a ..
mw.text.nowiki(msg) ..
mw.text.nowiki(msg) ..
'</strong>' ..
b ..
category
(category or '')
end
end


local function formatnumber(number)
local function formatNumber(number)
-- Return the given number formatted with commas as group separators,
-- Return the given number formatted with commas as group separators,
-- given that the number is an integer.
-- given that the number is an integer.
local numstr = tostring(number)
local numstr = tostring(number)
local length = #numstr
local length = #numstr
local places = collection()
local places = Collection.new()
local pos = 0
local pos = 0
repeat
repeat
Line 73: Line 92:
until pos >= length
until pos >= length
places:add(length)
places:add(length)
local groups = collection()
local groups = Collection.new()
for i = places.n, 2, -1 do
for i = places.n, 2, -1 do
local p1 = length - places[i] + 1
local p1 = length - places[i] + 1
Line 82: Line 101:
end
end


local function make_sort(value, sortable)
local function makeSort(value, sortable)
-- Return a sort key in a span if specified.
-- Return a sort key if requested.
-- Assume value is a valid number which has not overflowed.
-- Assume value is a valid number which has not overflowed.
if sortable == 'sortable_on' or sortable == 'sortable_debug' then
if sortable == 'sortable_table' or sortable == 'sortable_on' or sortable == 'sortable_debug' then
local sortkey
local sortkey
if value == 0 then
if value == 0 then
Line 100: Line 119:
sortkey = string.format('%d', prefix) .. string.format('%015.0f', math.floor(value * 10^(14-mag)))
sortkey = string.format('%d', prefix) .. string.format('%015.0f', math.floor(value * 10^(14-mag)))
end
end
local lhs = sortable == 'sortable_debug' and
local lhs, rhs
'<span style="border:1px solid;display:inline;" class="sortkey">' or
if sortable == 'sortable_table' then
'<span style="display:none" class="sortkey">'
lhs = 'data-sort-value="'
return lhs .. sortkey .. '♠</span>'
rhs = '"|'
else
lhs = sortable == 'sortable_debug' and
'<span style="border:1px solid;display:inline;" class="sortkey">' or
'<span style="display:none" class="sortkey">'
rhs = '♠</span>'
end
return lhs .. sortkey .. rhs
end
end
end
end


local translate_parameters = {
local translateParameters = {
abbr = {
abbr = {
off = 'abbr_off',
off = 'abbr_off',
Line 141: Line 167:
ymw = { 'y', 'm', 'w', id = 'ymw' },
ymw = { 'y', 'm', 'w', id = 'ymw' },
ymwd = { 'y', 'm', 'w', 'd', id = 'ymwd' },
ymwd = { 'y', 'm', 'w', 'd', id = 'ymwd' },
yd = { 'y', 'd', id = 'yd', keepzero = true },
yd = { 'y', 'd', id = 'yd', keepZero = true },
m = { 'm', id = 'm' },
m = { 'm', id = 'm' },
md = { 'm', 'd', id = 'md' },
md = { 'm', 'd', id = 'md' },
Line 161: Line 187:
off = false,
off = false,
on = 'sortable_on',
on = 'sortable_on',
table = 'sortable_table',
debug = 'sortable_debug',
debug = 'sortable_debug',
},
},
}
}


local function date_extract(frame)
local function dateExtract(frame)
-- Return part of a date after performing an optional operation.
-- Return part of a date after performing an optional operation.
local Date = get_exports(frame)
local Date = getExports(frame)
local args = frame:getParent().args
local args = frame:getParent().args
local parms = {}
local parms = {}
Line 183: Line 210:
return message('Need valid date')
return message('Need valid date')
end
end
local add = strip_to_nil(args.add)
local add = stripToNil(args.add)
if add then
if add then
for item in add:gmatch('%S+') do
for item in add:gmatch('%S+') do
Line 193: Line 220:
end
end
local prefix, result
local prefix, result
local sortable = translate_parameters.sortable[args.sortable]
local sortable = translateParameters.sortable[args.sortable]
if sortable then
if sortable then
local value = (date.partial and date.partial.first or date).jdz
local value = (date.partial and date.partial.first or date).jdz
prefix = make_sort(value, sortable)
prefix = makeSort(value, sortable)
end
end
local show = strip_to_nil(args.show) or 'dmy'
local show = stripToNil(args.show) or 'dmy'
if show ~= 'hide' then
if show ~= 'hide' then
result = date[show]
result = date[show]
Line 212: Line 239:
end
end


local function make_text(values, components, names, options)
local function makeText(values, components, names, options)
-- Return wikitext representing an age or duration.
-- Return wikitext representing an age or duration.
local text = collection()
local text = Collection.new()
local count = #values
local count = #values
local sep = names.sep or ''
local sep = names.sep or ''
Line 220: Line 247:
-- v is a number (say 4 for 4 years), or a table ({4,5} for 4 or 5 years).
-- v is a number (say 4 for 4 years), or a table ({4,5} for 4 or 5 years).
local islist = type(v) == 'table'
local islist = type(v) == 'table'
if (islist or v > 0) or (text.n == 0 and i == count) or (text.n > 0 and components.keepzero) then
if (islist or v > 0) or (text.n == 0 and i == count) or (text.n > 0 and components.keepZero) then
local fmt, vstr
local fmt, vstr
if i == 1 and options.format == 'format_commas' then
if i == 1 and options.format == 'format_commas' then
-- Numbers after the first should be small and not need formatting.
-- Numbers after the first should be small and not need formatting.
fmt = formatnumber
fmt = formatNumber
else
else
fmt = tostring
fmt = tostring
Line 283: Line 310:
end
end


local function date_difference(parms)
local function dateDifference(parms)
-- Return a formatted date difference using the given parameters
-- Return a formatted date difference using the given parameters
-- which have been validated.
-- which have been validated.
Line 323: Line 350:
local show = parms.show  -- may be nil; default is set below
local show = parms.show  -- may be nil; default is set below
local abbr = parms.abbr or 'abbr_off'
local abbr = parms.abbr or 'abbr_off'
local default_join
local defaultJoin
if abbr ~= 'abbr_off' then
if abbr ~= 'abbr_off' then
default_join = 'sep_space'
defaultJoin = 'sep_space'
end
end
if not show then
if not show then
Line 331: Line 358:
if parms.disp == 'disp_age' then
if parms.disp == 'disp_age' then
if diff.years < 3 then
if diff.years < 3 then
default_join = 'sep_space'
defaultJoin = 'sep_space'
if diff.years >= 1 then
if diff.years >= 1 then
show = 'ym'
show = 'ym'
Line 343: Line 370:
end
end
if type(show) ~= 'table' then
if type(show) ~= 'table' then
show = translate_parameters.show[show]
show = translateParameters.show[show]
end
end
if parms.disp == 'disp_raw' then
if parms.disp == 'disp_raw' then
default_join = 'sep_space'
defaultJoin = 'sep_space'
abbr = 'abbr_raw'
abbr = 'abbr_raw'
elseif parms.want_sc then
elseif parms.wantSc then
default_join = 'sep_serialcomma'
defaultJoin = 'sep_serialcomma'
end
end
local diff_options = {
local diffOptions = {
round = parms.round,
round = parms.round,
duration = parms.want_duration,
duration = parms.wantDuration,
range = parms.range and true or nil,
range = parms.range and true or nil,
}
}
local prefix
local prefix
if parms.sortable then
if parms.sortable then
local value = diff.age_days + (parms.want_duration and 1 or 0)  -- days and fraction of a day
local value = diff.age_days + (parms.wantDuration and 1 or 0)  -- days and fraction of a day
if diff.isnegative then
if diff.isnegative then
value = -value
value = -value
end
end
prefix = make_sort(value, parms.sortable)
prefix = makeSort(value, parms.sortable)
end
end
local text_options = {
local textOptions = {
prefix = prefix,
prefix = prefix,
suffix = parms.suffix,  -- not currently used
suffix = parms.suffix,  -- not currently used
format = parms.format,
format = parms.format,
join = parms.sep or default_join,
join = parms.sep or defaultJoin,
isnegative = diff.isnegative,
isnegative = diff.isnegative,
range = parms.range,
range = parms.range,
Line 375: Line 402:
return prefix or ''
return prefix or ''
end
end
local values = { diff:age(show.id, diff_options) }
local values = { diff:age(show.id, diffOptions) }
if values[1] then
if values[1] then
return make_text(values, show, names[abbr], text_options)
return makeText(values, show, names[abbr], textOptions)
end
if diff.partial then
-- Handle a more complex range such as
-- {{age_yd|20 Dec 2001|2003|range=yes}} → 1 year, 12 days or 2 years, 11 days
local opt = {
format = textOptions.format,
join = textOptions.join,
isnegative = textOptions.isnegative,
}
return
(textOptions.prefix or '') ..
makeText({ diff.partial.mindiff:age(show.id, diffOptions) }, show, names[abbr], opt) ..
(textOptions.range == 'dash' and '–' or '&nbsp;or ') ..
makeText({ diff.partial.maxdiff:age(show.id, diffOptions) }, show, names[abbr], opt) ..
(textOptions.suffix or '')
end
end
return message('Parameter show=' .. show.id .. ' is not supported here')
return message('Parameter show=' .. show.id .. ' is not supported here')
end
end


local function get_dates(frame, getopt)
local function getDates(frame, getopt)
-- Parse template parameters and return one of:
-- Parse template parameters and return one of:
-- * date        (a date table, if single)
-- * date        (a date table, if single)
Line 388: Line 430:
-- * text        (a string error message)
-- * text        (a string error message)
-- A missing date is replaced with the current date.
-- A missing date is replaced with the current date.
-- If want_mixture is true, a missing date component is replaced
-- If wantMixture is true, a missing date component is replaced
-- from the current date, so can get a bizarre mixture of
-- from the current date, so can get a bizarre mixture of
-- specified/current y/m/d as has been done by some "age" templates.
-- specified/current y/m/d as has been done by some "age" templates.
-- Some results may be placed in table getopt.
-- Some results may be placed in table getopt.
local Date, current_date = get_exports(frame)
local Date, currentDate = getExports(frame)
getopt = getopt or {}
getopt = getopt or {}
local fix = getopt.fix and 'fix' or ''
local fix = getopt.fix and 'fix' or ''
local partial = getopt.range and 'partial' or ''
local partial = getopt.partial and 'partial' or ''
local args = frame:getParent().args
local args = frame:getParent().args
local fields = {}
local fields = {}
local is_named = args.year or args.year1 or args.year2 or
local isNamed = args.year or args.year1 or args.year2 or
args.month or args.month1 or args.month2 or
args.month or args.month1 or args.month2 or
args.day or args.day1 or args.day2
args.day or args.day1 or args.day2
if is_named then
if isNamed then
fields[1] = args.year1 or args.year
fields[1] = args.year1 or args.year
fields[2] = args.month1 or args.month
fields[2] = args.month1 or args.month
Line 415: Line 457:
local imax = 0
local imax = 0
for i = 1, 6 do
for i = 1, 6 do
fields[i] = strip_to_nil(fields[i])
fields[i] = stripToNil(fields[i])
if fields[i] then
if fields[i] then
imax = i
imax = i
end
end
end
end
local single = getopt.single
local noDefault = imax == 0 and getopt.noMissing
local dates = {}
local dates = {}
if is_named or imax > 2 then
if isNamed or imax >= 3 then
local nr_dates = single and 1 or 2
local nrDates = getopt.single and 1 or 2
if getopt.want_mixture then
if getopt.wantMixture then
-- Cannot be partial since empty fields are set from current.
-- Cannot be partial since empty fields are set from current.
local components = { 'year', 'month', 'day' }
local components = { 'year', 'month', 'day' }
for i = 1, nr_dates * 3 do
for i = 1, nrDates * 3 do
fields[i] = fields[i] or current_date[components[i > 3 and i - 3 or i]]
fields[i] = fields[i] or currentDate[components[i > 3 and i - 3 or i]]
end
end
for i = 1, nr_dates do
for i = 1, nrDates do
local index = i == 1 and 1 or 4
local index = i == 1 and 1 or 4
dates[i] = Date(fields[index], fields[index+1], fields[index+2])
dates[i] = Date(fields[index], fields[index+1], fields[index+2])
end
end
else
else
for i = 1, nr_dates do
for i = 1, nrDates do
local index = i == 1 and 1 or 4
local index = i == 1 and 1 or 4
local y, m, d = fields[index], fields[index+1], fields[index+2]
local y, m, d = fields[index], fields[index+1], fields[index+2]
if (partial and y) or (y and m and d) then
if (partial and y) or (y and m and d) then
dates[i] = Date(fix, partial, y, m, d)
dates[i] = Date(fix, partial, y, m, d)
elseif not (y or m or d) then
elseif not y and not m and not d and not noDefault then
dates[i] = Date('currentdate')
dates[i] = Date('currentdate')
end
end
end
end
end
end
else
elseif not noDefault then
getopt.textdates = true
getopt.textdates = true -- have parsed each date from a single text field
dates[1] = Date(fix, partial, fields[1] or 'currentdate')
dates[1] = Date(fix, partial, fields[1] or 'currentdate')
if not single then
if not getopt.single then
dates[2] = Date(fix, partial, fields[2] or 'currentdate')
dates[2] = Date(fix, partial, fields[2] or 'currentdate')
end
end
Line 455: Line 497:
return message('Need valid year, month, day')
return message('Need valid year, month, day')
end
end
if single then
if getopt.single then
return dates[1]
return dates[1]
end
end
Line 464: Line 506:
end
end


local function age_generic(frame)
local function ageGeneric(frame)
-- Return the result required by the specified template.
-- Return the result required by the specified template.
-- Can use sortable=x where x = on/off/debug in any supported template.
-- Can use sortable=x where x = on/table/off/debug in any supported template.
-- Some templates default to sortable=on but can be overridden with sortable=off.
-- Some templates default to sortable=on but can be overridden.
local name = frame.args.template
local name = frame.args.template
if not name then
if not name then
Line 542: Line 584:
format = 'format_commas',
format = 'format_commas',
sep = args.sep ~= 'and' and 'sep_comma' or nil,
sep = args.sep ~= 'and' and 'sep_comma' or nil,
sortable = 'on',        -- temporarily use sortable for compatibility with old template; talk proposes removing this
},
},
age_yd_nts = {              -- {{age in years and days nts}}
age_yd_nts = {              -- {{age in years and days nts}}
Line 560: Line 601:
age_ymwd = {                -- {{age in years, months, weeks and days}}
age_ymwd = {                -- {{age in years, months, weeks and days}}
show = 'ymwd',
show = 'ymwd',
want_mixture = true,
wantMixture = true,
},
},
}
}
Line 568: Line 609:
end
end
if name == 'age_days' then
if name == 'age_days' then
local su = strip_to_nil(args['show unit'])
local su = stripToNil(args['show unit'])
if su then
if su then
if su == 'abbr' or su == 'full' then
if su == 'abbr' or su == 'full' then
Line 576: Line 617:
end
end
end
end
local range = spec.range or yes(args.range) or (args.range == 'dash' and 'dash' or nil)
local partial
local range = stripToNil(args.range) or spec.range
if range then
-- Suppose partial dates are used and age could be 11 or 12 years.
-- "|range=" (empty value) has no effect (spec is used).
-- "|range=yes" or spec.range == true sets range = true (gives "11 or 12")
-- "|range=dash" sets range = 'dash' (gives "11–12").
-- "|range=no" sets range = nil (gives "12").
--    Above gives a good result with age in years, but is probably unhelpful for other cases.
--    {{age in years|year1=1900|year2=1910|range=no}} → 10
--    {{age in days|year1=1900|year2=1910|range=no}}  → 4016 (from 1900-01-01 to 1910-12-31)
-- "|range=OTHER" sets range = nil and rejects partial dates.
range = ({ dash = 'dash', 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
range = nil
end
end
end
local getopt = {
local getopt = {
fix = yes(args.fix),
fix = yes(args.fix),
range = range,
partial = partial,
want_mixture = spec.want_mixture,
wantMixture = spec.wantMixture,
}
}
local date1, date2 = get_dates(frame, getopt)
local date1, date2 = getDates(frame, getopt)
if type(date1) == 'string' then
if type(date1) == 'string' then
return date1
return date1
end
end
local format = strip_to_nil(args.format)
local format = stripToNil(args.format)
if format then
if format then
format = 'format_' .. format
format = 'format_' .. format
Line 594: Line 654:
local parms = {
local parms = {
diff = date2 - date1,
diff = date2 - date1,
want_duration = spec.duration or yes(args.duration),
wantDuration = spec.duration or yes(args.duration),
range = range,
range = range,
want_sc = yes(args.sc),
wantSc = yes(args.sc),
show = args.show == 'hide' and 'hide' or spec.show,
show = args.show == 'hide' and 'hide' or spec.show,
abbr = spec.abbr,
abbr = spec.abbr,
Line 603: Line 663:
round = yes(args.round),
round = yes(args.round),
sep = spec.sep,
sep = spec.sep,
sortable = translate_parameters.sortable[args.sortable or spec.sortable],
sortable = translateParameters.sortable[args.sortable or spec.sortable],
}
}
if (spec.negative or frame.args.negative) == 'error' and parms.diff.isnegative then
if (spec.negative or frame.args.negative) == 'error' and parms.diff.isnegative then
return message('The second date should not be before the first date')
return message('The second date should not be before the first date')
end
end
return date_difference(parms)
return dateDifference(parms)
end
 
local function bda(frame)
-- Implement [[Template:Birth date and age]].
local args = frame:getParent().args
local options = { noMissing=true, single=true }
local date = getDates(frame, options)
if type(date) == 'string' then
return date  -- error text
end
local Date = getExports(frame)
local diff = Date('currentdate') - date
if diff.isnegative or diff.years > 150 then
return message('Invalid birth date for calculating age')
end
local disp, show = 'disp_raw', 'y'
if diff.years < 2 then
disp = 'disp_age'
if diff.years == 0 and diff.months == 0 then
show = 'd'
else
show = 'm'
end
end
local df = stripToNil(args.df)  -- day first (dmy); default is month first (mdy)
local result = df and
'%-d %B %-Y' or
'%B %-d, %-Y'
result = '(<span class="bday">%-Y-%m-%d</span>) </span>' .. result
result = '<span style="display:none"> ' ..
date:text(result) ..
'<span class="noprint ForceAgeToShow"> ' ..
'(age&nbsp;' ..
dateDifference({
diff = diff,
show = show,
abbr = 'abbr_off',
disp = disp,
sep = 'sep_space',
}) ..
')</span>'
local warnings = tonumber(frame.args.warnings)
if warnings and warnings > 0 then
local good = {
df = true,
mf = true,
template = true,
day = true,
day1 = true,
month = true,
month1 = true,
year = true,
year1 = true,
}
local invalid
local imax = options.textdates and 1 or 3
for k, _ in pairs(args) do
if type(k) == 'number' then
if k > imax then
invalid = tostring(k)
break
end
else
if not good[k] then
invalid = k
break
end
end
end
if invalid then
result = result .. message('invalid parameter ' .. invalid, 'warning')
end
end
return result
end
end


local function date_to_gsd(frame)
local function dateToGsd(frame)
-- This implements {{gregorian serial date}}.
-- Implement [[Template:Gregorian serial date]].
-- Return Gregorian serial date of the given date, or the current date.
-- Return Gregorian serial date of the given date, or the current date.
-- The returned value is negative for dates before 1 January 1 AD
-- The returned value is negative for dates before 1 January 1 AD
-- despite the fact that GSD is not defined for such dates.
-- despite the fact that GSD is not defined for such dates.
local date = get_dates(frame, { want_mixture=true, single=true })
local date = getDates(frame, { wantMixture=true, single=true })
if type(date) == 'string' then
if type(date) == 'string' then
return date
return date
Line 623: Line 757:
end
end


local function jd_to_date(frame)
local function jdToDate(frame)
-- Return formatted date from a Julian date.
-- Return formatted date from a Julian date.
-- The result includes a time if the input includes a fraction.
-- The result includes a time if the input includes a fraction.
-- The word 'Julian' is accepted for the Julian calendar.
-- The word 'Julian' is accepted for the Julian calendar.
local Date = get_exports(frame)
local Date = getExports(frame)
local args = frame:getParent().args
local args = frame:getParent().args
local date = Date('juliandate', args[1], args[2])
local date = Date('juliandate', args[1], args[2])
Line 636: Line 770:
end
end


local function date_to_jd(frame)
local function dateToJd(frame)
-- Return Julian date (a number) from a date which may include a time,
-- Return Julian date (a number) from a date which may include a time,
-- or the current date ('currentdate') or current date and time ('currentdatetime').
-- or the current date ('currentdate') or current date and time ('currentdatetime').
-- The word 'Julian' is accepted for the Julian calendar.
-- The word 'Julian' is accepted for the Julian calendar.
local Date = get_exports(frame)
local Date = getExports(frame)
local args = frame:getParent().args
local args = frame:getParent().args
local date = Date(args[1], args[2], args[3], args[4], args[5], args[6], args[7])
local date = Date(args[1], args[2], args[3], args[4], args[5], args[6], args[7])
Line 649: Line 783:
end
end


local function time_interval(frame)
local function timeInterval(frame)
-- This implements {{time interval}}.
-- Implement [[Template:Time interval]].
-- There are two positional arguments: date1, date2.
-- There are two positional arguments: date1, date2.
-- The default for each is the current date and time.
-- The default for each is the current date and time.
-- Result is date2 - date1 formatted.
-- Result is date2 - date1 formatted.
local Date = get_exports(frame)
local Date = getExports(frame)
local args = frame:getParent().args
local args = frame:getParent().args
local parms = {
local parms = {
want_duration = yes(args.duration),
wantDuration = yes(args.duration),
range = yes(args.range) or (args.range == 'dash' and 'dash' or nil),
range = yes(args.range) or (args.range == 'dash' and 'dash' or nil),
want_sc = yes(args.sc),
wantSc = yes(args.sc),
}
}
local fix = yes(args.fix) and 'fix' or ''
local fix = yes(args.fix) and 'fix' or ''
local date1 = Date(fix, 'partial', strip_to_nil(args[1]) or 'currentdatetime')
local date1 = Date(fix, 'partial', stripToNil(args[1]) or 'currentdatetime')
if not date1 then
if not date1 then
return message('Invalid start date in first parameter')
return message('Invalid start date in first parameter')
end
end
local date2 = Date(fix, 'partial', strip_to_nil(args[2]) or 'currentdatetime')
local date2 = Date(fix, 'partial', stripToNil(args[2]) or 'currentdatetime')
if not date2 then
if not date2 then
return message('Invalid end date in second parameter')
return message('Invalid end date in second parameter')
end
end
parms.diff = date2 - date1
parms.diff = date2 - date1
for argname, translate in pairs(translate_parameters) do
for argname, translate in pairs(translateParameters) do
local parm = strip_to_nil(args[argname])
local parm = stripToNil(args[argname])
if parm then
if parm then
parm = translate[parm]
parm = translate[parm]
Line 690: Line 824:
end
end
else
else
parms.show = translate_parameters.show[round]
parms.show = translateParameters.show[round]
end
end
end
end
parms.round = true
parms.round = true
end
end
return date_difference(parms)
return dateDifference(parms)
end
end


return {
return {
age_generic = age_generic,         -- can emulate several age templates
age_generic = ageGeneric,           -- can emulate several age templates
gsd = date_to_gsd,                 -- Template:Gregorian_serial_date
birth_date_and_age = bda,          -- Template:Birth_date_and_age
extract = date_extract,           -- Template:Extract
gsd = dateToGsd,                   -- Template:Gregorian_serial_date
jd_to_date = jd_to_date,           -- Template:?
extract = dateExtract,             -- Template:Extract
JULIANDAY = date_to_jd,           -- Template:JULIANDAY
jd_to_date = jdToDate,             -- Template:?
time_interval = time_interval,     -- Template:Time_interval
JULIANDAY = dateToJd,               -- Template:JULIANDAY
time_interval = timeInterval,       -- Template:Time_interval
}
}
Anonymous user