Module:Age - Revision history

Ondo: 29 revisions imported from :wikipedia:Module:Age: see Topic:Vtixlm0q28eo6jtf

2021-05-21T11:41:21Z

29 revisions imported from wikipedia:Module:Age: see Topic:Vtixlm0q28eo6jtf

← Older revision	Revision as of 11:41, 21 May 2021
(No difference)

wikipedia>Johnuniq: update from Module:Age/sandbox; this aids localization; used at bnwiki + bswiki

2021-04-24T03:37:39Z

update from Module:Age/sandbox; this aids localization; used at bnwiki + bswiki

Show changes

wikipedia>Johnuniq: update from sandbox: implement show=M (minutes) and show=s (seconds)

2020-08-03T02:55:15Z

update from sandbox: implement show=M (minutes) and show=s (seconds)

← Older revision		Revision as of 02:55, 3 August 2020
Line 276:		Line 276:
	hm = { 'H', 'M', id = 'hm' },		hm = { 'H', 'M', id = 'hm' },
	hms = { 'H', 'M', 'S', id = 'hms' },		hms = { 'H', 'M', 'S', id = 'hms' },
			M = { 'M', id = 'M' },
			s = { 'S', id = 's' },
	d = { 'd', id = 'd' },		d = { 'd', id = 'd' },
	dh = { 'd', 'H', id = 'dh' },		dh = { 'd', 'H', id = 'dh' },

wikipedia>Johnuniq: fix bug that can occur in {{age in years, months, weeks and days}} if attempt to make an invalid yyyy-02-29 date due to unwise wantMixture used to emulate original template

2020-02-29T10:05:40Z

fix bug that can occur in {{age in years, months, weeks and days}} if attempt to make an invalid yyyy-02-29 date due to unwise wantMixture used to emulate original template

← Older revision		Revision as of 10:05, 29 February 2020
Line 624:		Line 624:
	for i = 1, nrDates 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])		local y, m, d = fields[index], fields[index+1], fields[index+2]
			if (m == 2 or m == '2') and (d == 29 or d == '29') then
			-- Workaround error with following which attempt to use invalid date 2001-02-29.
			-- {{age_ymwd\|year1=2001\|year2=2004\|month2=2\|day2=29}}
			-- {{age_ymwd\|year1=2001\|month1=2\|year2=2004\|month2=1\|day2=29}}
			-- TODO Get rid of wantMixture because even this ugly code does not handle
			-- 'Feb' or 'February' or 'feb' or 'february'.
			if not ((y % 4 == 0 and y % 100 ~= 0) or y % 400 == 0) then
			d = 28
			end
			end
			dates[i] = Date(y, m, d)
	end		end
	else		else

wikipedia>Johnuniq: update from sandbox: use data-sort-value for sort keys per Module talk:Age#Sorting will use data-sort-value

2019-05-03T03:32:01Z

update from sandbox: use data-sort-value for sort keys per Module talk:Age#Sorting will use data-sort-value

← Older revision		Revision as of 03:32, 3 May 2019
Line 195:		Line 195:
	if mw.ustring.len(extra) > 1 then		if mw.ustring.len(extra) > 1 then
	-- Parameter "~" gives "~3" whereas "over" gives "over 3".		-- Parameter "~" gives "~3" whereas "over" gives "over 3".
	extra = extra .. ' '		if extra:sub(-6, -1) ~= ' ' then
			extra = extra .. ' '
			end
	end		end
	if flagCurrent then		if flagCurrent then
Line 220:		Line 222:
	sortKey = string.format('%d', sortKey) .. string.format('%015.0f', math.floor(value * 10^(14-mag)))		sortKey = string.format('%d', sortKey) .. string.format('%015.0f', math.floor(value * 10^(14-mag)))
	end		end
	local ~~lhs, rhs~~		local result
	if sortable == 'sortable_table' then		if sortable == 'sortable_table' then
	~~lhs~~ = 'data-sort-value="'		result = 'data-sort-value="_SORTKEY_"\|'
	~~rhs~~ = '"\|'		elseif sortable == 'sortable_debug' then
			result = '<span data-sort-value="_SORTKEY_♠"><span style="border:1px solid">_SORTKEY_♠</span></span>'
	else		else
	~~lhs~~ = ~~sortable == 'sortable_debug' and~~		result = '<span data-sort-value="_SORTKEY_♠"></span>'
	'<span ~~style~~="~~border:1px solid;display:inline;" class="sortkey~~">~~' or~~
	~~'<span style="display:none" class="sortkey">'~~
	~~rhs = '♠~~</span>'
	end		end
	return ~~lhs ..~~ sortKey ~~.. rhs~~		return result:gsub('_SORTKEY_', sortKey)
	end		end
	end		end
Line 351:		Line 351:
	end		end
	end		end
	return (sortKey or '') .. (result or '')		return (sortKey or '') .. makeExtra(args) .. (result or '')
	end		end

wikipedia>Johnuniq: update from sandbox: Template:Death date and age now gives an error if the death date is in future by more than one day

2019-04-07T23:47:22Z

update from sandbox: Template:Death date and age now gives an error if the death date is in future by more than one day

← Older revision		Revision as of 23:47, 7 April 2019
Line 9:		Line 9:
	['mt-conflicting-show'] = 'Parameter show=$1 conflicts with round=$2',		['mt-conflicting-show'] = 'Parameter show=$1 conflicts with round=$2',
	['mt-date-wrong-order'] = 'The second date must be later in time than the first date',		['mt-date-wrong-order'] = 'The second date must be later in time than the first date',
			['mt-dd-future'] = 'Death date (first date) must not be in the future',
	['mt-dd-wrong-order'] = 'Death date (first date) must be later in time than the birth date (second date)',		['mt-dd-wrong-order'] = 'Death date (first date) must be later in time than the birth date (second date)',
	['mt-invalid-bd-age'] = 'Invalid birth date for calculating age',		['mt-invalid-bd-age'] = 'Invalid birth date for calculating age',
Line 923:		Line 924:
	if diff.isnegative then		if diff.isnegative then
	return message('mt-dd-wrong-order')		return message('mt-dd-wrong-order')
			end
			local Date = getExports(frame)
			local today = Date('currentdate') + 1 -- one day in future allows for timezones
			if date1 > today then
			return message('mt-dd-future')
	end		end
	local years		local years

wikipedia>Johnuniq: fix message per Template talk:Death date and age#confusing error message and update from i18n for :bn:Module:বয়স

2019-03-31T01:07:16Z

fix message per Template talk:Death date and age#confusing error message and update from i18n for bn:Module:বয়স

Show changes

wikipedia>Johnuniq: update from sandbox: implement Template:Death date and age

2019-01-07T22:50:02Z

update from sandbox: implement Template:Death date and age

@@ Line 499: / Line 499: @@
 		-- Don't bother detecting if wantMixture is used because not needed and it is a poor option.
 		if not text then
 			text = 'currentdate'
 			if getopt.flag == 'usesCurrent' then
@@ Line 537: / Line 540: @@
 	end
 	local fix = getopt.fix and 'fix' or ''
 	local partialText = getopt.partial and 'partial' or ''
 	local dates = {}
@@ Line 563: / Line 565: @@
 				if (getopt.partial and y and (m or not d)) or (y and m and d) then
 					dates[i] = Date(fix, partialText, y, m, d)
-				elseif not y and not m and not d and not noDefault then
+				elseif not y and not m and not d then
 					dates[i] = Date(flagCurrent())
 				end
 			end
 		end
-	elseif not noDefault then
+	else
 		getopt.textdates = true  -- have parsed each date from a single text field
 		dates[1] = Date(fix, partialText, flagCurrent(fields[1]))
@@ Line 576: / Line 578: @@
 	end
 	if not dates[1] then
-		return message('Need valid year, month, day')
+		return message(getopt.missing1 or 'Need valid year, month, day')
 	end
 	if getopt.single then
@@ Line 582: / Line 584: @@
 	end
 	if not dates[2] then
-		return message('Second date should be year, month, day')
+		return message(getopt.missing2 or 'Second date should be year, month, day')
 	end
 	return dates[1], dates[2]
@@ Line 762: / Line 764: @@
 	-- Implement [[Template:Birth date and age]].
 	local args = frame:getParent().args
-	local options = { noMissing=true, single=true }
+	local options = {
 	local date = getDates(frame, options)
 	if type(date) == 'string' then
@@ Line 812: / Line 818: @@
 		local invalid
 		local imax = options.textdates and 1 or 3
 		for k, _ in pairs(args) do
 			if type(k) == 'number' then
@@ Line 923: / Line 1,011: @@
 	age_generic = ageGeneric,           -- can emulate several age templates
 	birth_date_and_age = bda,           -- Template:Birth_date_and_age
 	gsd = dateToGsd,                    -- Template:Gregorian_serial_date
 	extract = dateExtract,              -- Template:Extract

wikipedia>Johnuniq: update from sandbox: prefix=TEXT inserts TEXT before visible result but after any sort key, with space appended to TEXT if it is more than one character

2018-10-12T10:20:17Z

update from sandbox: prefix=TEXT inserts TEXT before visible result but after any sort key, with space appended to TEXT if it is more than one character

← Older revision		Revision as of 10:20, 12 October 2018
Line 115:		Line 115:
	options.ordinal -- true: 'first' instead of 'one'		options.ordinal -- true: 'first' instead of 'one'
	) or number		) or number
			end

			local function makeExtra(args, flagCurrent)
			-- Return extra text that will be inserted before the visible result
			-- but after any sort key.
			local extra = args.prefix or ''
			if mw.ustring.len(extra) > 1 then
			-- Parameter "~" gives "~3" whereas "over" gives "over 3".
			extra = extra .. ' '
			end
			if flagCurrent then
			extra = '<span class="currentage"></span>' .. extra
			end
			return extra
	end		end

Line 121:		Line 135:
	-- Assume value is a valid number which has not overflowed.		-- Assume value is a valid number which has not overflowed.
	if sortable == 'sortable_table' or 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
	~~sortkey~~ = '5000000000000000000'		sortKey = '5000000000000000000'
	else		else
	local mag = math.floor(math.log10(math.abs(value)) + 1e-14)		local mag = math.floor(math.log10(math.abs(value)) + 1e-14)
	~~local prefix~~
	if value > 0 then		if value > 0 then
	~~prefix~~ = 7000 + mag		sortKey = 7000 + mag
	else		else
	~~prefix~~ = 2999 - mag		sortKey = 2999 - mag
	value = value + 10^(mag+1)		value = value + 10^(mag+1)
	end		end
	~~sortkey~~ = string.format('%d', ~~prefix~~) .. string.format('%015.0f', math.floor(value * 10^(14-mag)))		sortKey = string.format('%d', sortKey) .. string.format('%015.0f', math.floor(value * 10^(14-mag)))
	end		end
	local lhs, rhs		local lhs, rhs
Line 145:		Line 158:
	rhs = '♠</span>'		rhs = '♠</span>'
	end		end
	return lhs .. ~~sortkey~~ .. rhs		return lhs .. sortKey .. rhs
	end		end
	end		end
Line 250:		Line 263:
	end		end
	end		end
	local ~~prefix~~, result		local sortKey, result
	local sortable = translateParameters.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~~ = makeSort(value, sortable)		sortKey = makeSort(value, sortable)
	end		end
	if show ~= 'hide' then		if show ~= 'hide' then
Line 266:		Line 279:
	end		end
	end		end
	return (~~prefix~~ or '') .. (result or '')		return (sortKey or '') .. (result or '')
	end		end

Line 344:		Line 357:
	end		end
	return		return
	(options.~~prefix~~ or '') ..		(options.sortKey or '') ..
	(options.extra or '') ..		(options.extra or '') ..
	sign ..		sign ..
Line 424:		Line 437:
	range = parms.range and true or nil,		range = parms.range and true or nil,
	}		}
	local ~~prefix~~		local sortKey
	if parms.sortable then		if parms.sortable then
	local value = diff.age_days + (parms.wantDuration 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
Line 430:		Line 443:
	value = -value		value = -value
	end		end
	~~prefix~~ = makeSort(value, parms.sortable)		sortKey = makeSort(value, parms.sortable)
	end		end
	local textOptions = {		local textOptions = {
	~~prefix = prefix,~~
	~~suffix = parms.suffix, -- not currently used~~
	extra = parms.extra,		extra = parms.extra,
	format = parms.format,		format = parms.format,
Line 440:		Line 451:
	isnegative = diff.isnegative,		isnegative = diff.isnegative,
	range = parms.range,		range = parms.range,
			sortKey = sortKey,
	spell = parms.spell,		spell = parms.spell,
			suffix = parms.suffix, -- not currently used
	}		}
	if show.id == 'hide' then		if show.id == 'hide' then
	return ~~prefix~~ or ''		return sortKey or ''
	end		end
	local values = { diff:age(show.id, diffOptions) }		local values = { diff:age(show.id, diffOptions) }
Line 459:		Line 472:
	}		}
	return		return
	(textOptions.~~prefix~~ or '') ..		(textOptions.sortKey or '') ..
	makeText({ diff.partial.mindiff:age(show.id, diffOptions) }, show, names[abbr], opt) ..		makeText({ diff.partial.mindiff:age(show.id, diffOptions) }, show, names[abbr], opt) ..
	rangeJoin(textOptions.range) ..		rangeJoin(textOptions.range) ..
Line 733:		Line 746:
	abbr = spec.abbr,		abbr = spec.abbr,
	disp = spec.disp,		disp = spec.disp,
	extra = (getopt.usesCurrent and format ~= 'format_raw') ~~and '<span class="currentage"></span>' or nil~~,		extra = makeExtra(args, getopt.usesCurrent and format ~= 'format_raw'),
	format = format or spec.format,		format = format or spec.format,
	round = yes(args.round),		round = yes(args.round),
Line 865:		Line 878:
	local args = frame:getParent().args		local args = frame:getParent().args
	local parms = {		local parms = {
			extra = makeExtra(args),
	wantDuration = 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),

wikipedia>Johnuniq: update from sandbox: can spell ages using age_generic with format=cardinal + format=ordinal and more

2018-05-14T03:25:04Z

update from sandbox: can spell ages using age_generic with format=cardinal + format=ordinal and more

← Older revision		Revision as of 03:25, 14 May 2018
Line 99:		Line 99:
	end		end
	return groups:join(',')		return groups:join(',')
			end

			local function spellNumber(number, options, i)
			-- Return result of spelling number, or
			-- return number (as a string) if cannot spell it.
			-- i == 1 for the first number which can optionally start with an uppercase letter.
			number = tostring(number)
			return require('Module:ConvertNumeric').spell_number(
			number,
			nil, -- fraction numerator
			nil, -- fraction denominator
			i == 1 and options.upper, -- true: 'One' instead of 'one'
			not options.us, -- true: use 'and' between tens/ones etc
			options.adj, -- true: hyphenated
			options.ordinal -- true: 'first' instead of 'one'
			) or number
	end		end

Line 190:		Line 206:
	debug = 'sortable_debug',		debug = 'sortable_debug',
	},		},
			}

			local spellOptions = {
			cardinal = {},
			Cardinal = { upper = true },
			cardinal_us = { us = true },
			Cardinal_us = { us = true, upper = true },
			ordinal = { ordinal = true },
			Ordinal = { ordinal = true, upper = true },
			ordinal_us = { ordinal = true, us = true },
			Ordinal_us = { ordinal = true, us = true, upper = true },
	}		}

Line 247:		Line 274:
	end		end

	local function makeText(values, components, names, options)		local function makeText(values, components, names, options, noUpper)
	-- Return wikitext representing an age or duration.		-- Return wikitext representing an age or duration.
	local text = Collection.new()		local text = Collection.new()
Line 257:		Line 284:
	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 options.spell then
			fmt = function(number)
			return spellNumber(number, options.spell, noUpper or i)
			end
			elseif 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
Line 264:		Line 295:
	end		end
	if islist then		if islist then
	vstr = fmt(v[1]) .. rangeJoin(options.range) .. fmt(v[2])		vstr = fmt(v[1]) .. rangeJoin(options.range)
			noUpper = true
			vstr = vstr .. fmt(v[2])
	else		else
	vstr = fmt(v)		vstr = fmt(v)
Line 407:		Line 440:
	isnegative = diff.isnegative,		isnegative = diff.isnegative,
	range = parms.range,		range = parms.range,
			spell = parms.spell,
	}		}
	if show.id == 'hide' then		if show.id == 'hide' then
Line 422:		Line 456:
	join = textOptions.join,		join = textOptions.join,
	isnegative = textOptions.isnegative,		isnegative = textOptions.isnegative,
			spell = textOptions.spell,
	}		}
	return		return
Line 427:		Line 462:
	makeText({ diff.partial.mindiff:age(show.id, diffOptions) }, show, names[abbr], opt) ..		makeText({ diff.partial.mindiff:age(show.id, diffOptions) }, show, names[abbr], opt) ..
	rangeJoin(textOptions.range) ..		rangeJoin(textOptions.range) ..
	makeText({ diff.partial.maxdiff:age(show.id, diffOptions) }, show, names[abbr], opt) ..		makeText({ diff.partial.maxdiff:age(show.id, diffOptions) }, show, names[abbr], opt, true) ..
	(textOptions.suffix or '')		(textOptions.suffix or '')
	end		end
Line 684:		Line 719:
	end		end
	local format = stripToNil(args.format)		local format = stripToNil(args.format)
			local spell = spellOptions[format]
	if format then		if format then
	format = 'format_' .. format		format = 'format_' .. format
Line 702:		Line 738:
	sep = spec.sep,		sep = spec.sep,
	sortable = translateParameters.sortable[args.sortable or spec.sortable],		sortable = translateParameters.sortable[args.sortable or spec.sortable],
			spell = spell,
	}		}
	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