Module:Time ago - Revision history

GreenC: add new feature "|numeric" to print number only

2021-02-02T18:35:13Z

add new feature "|numeric" to print number only

← Previous revision		Revision as of 18:35, 2 February 2021
Line 156:		Line 156:
	else		else
	result_num_text = tostring( result_num )		result_num_text = tostring( result_num )
			end

			-- numeric or string
			local numeric_out = args.numeric
			local result = ""
			if numeric_out then
			result = tostring( result_num )
			else
		⚫	result = result_num_text .. ' ' .. result_unit .. suffix -- Spaces for suffix have been added in earlier.
	end		end

⚫	~~local~~ result = result_num_text .. '~~ ~~' .. result_unit .. suffix -- Spaces for suffix have been added in earlier.
	return result .. purge		return result .. purge
	end		end

Alexiaya: Use non-breaking space between number and unit

2020-06-04T15:09:18Z

Use non-breaking space between number and unit

← Previous revision		Revision as of 15:09, 4 June 2020
Line 158:		Line 158:
	end		end

	local result = result_num_text .. ' ' .. result_unit .. suffix -- Spaces for suffix have been added in earlier.		local result = result_num_text .. ' ' .. result_unit .. suffix -- Spaces for suffix have been added in earlier.
	return result .. purge		return result .. purge
	end		end

Wugapodes: Wugapodes moved page Module:Time Ago to Module:Time ago without leaving a redirect: shouldn't be caps, my bad

2019-11-08T05:00:20Z

Wugapodes moved page Module:Time Ago to Module:Time ago without leaving a redirect: shouldn't be caps, my bad

← Previous revision	Revision as of 05:00, 8 November 2019
(No difference)

Wugapodes: Wugapodes moved page Module:TimeAgo to Module:Time Ago without leaving a redirect: Per requested move Template_talk:Time_ago#Requested_move_30_October_2019

2019-11-08T04:59:33Z

Wugapodes moved page Module:TimeAgo to Module:Time Ago without leaving a redirect: Per requested move Template_talk:Time_ago#Requested_move_30_October_2019

← Previous revision	Revision as of 04:59, 8 November 2019
(No difference)

Johnuniq: update from Module:TimeAgo/sandbox per WT:Lua#Module:TimeAgo's calculations sometimes off by a week: tweaks + accurate results for weeks/months/years with little extra overhead

2019-04-18T07:23:03Z

update from Module:TimeAgo/sandbox per WT:Lua#Module:TimeAgo's calculations sometimes off by a week: tweaks + accurate results for weeks/months/years with little extra overhead

← Previous revision		Revision as of 07:23, 18 April 2019
Line 1:		Line 1:
	-- ~~Replacement for~~ [[Template:Time ago]]		-- Implement [[Template:Time ago]]

⚫	~~local~~ numberSpell = require('Module:NumberSpell')._main
	local yesno = ~~require('Module:Yesno')~~		local numberSpell, yesno -- lazy load

			function numberSpell(arg)
		⚫	numberSpell = require('Module:NumberSpell')._main
			return numberSpell(arg)
			end

			function yesno(arg)
			yesno = require('Module:Yesno')
			return yesno(arg)
			end

	local p = {}		local p = {}
Line 12:		Line 22:
	['days'] = 86400,		['days'] = 86400,
	['weeks'] = 604800,		['weeks'] = 604800,
	['months'] = ~~2678400~~,		['months'] = 2629800, -- 365.25 * 24 * 60 * 60 / 12
	['years'] = 31557600		['years'] = 31557600
	}		}
Line 22:		Line 32:
	[3600] = { 'hour', 'hours', "hour's", "hours'" },		[3600] = { 'hour', 'hours', "hour's", "hours'" },
	[86400] = { 'day', 'days', "day's", "days'" },		[86400] = { 'day', 'days', "day's", "days'" },
	[604800] = { 'week', 'weeks', "week's", "weeks'" },		[604800] = { 'week', 'weeks', "week's", "weeks'", unit = 'w' },
	[~~2678400~~] = { 'month', 'months', "month's", "months'" },		[2629800] = { 'month', 'months', "month's", "months'", unit = 'm' },
	[31557600] = { 'year', 'years', "year's", "years'" }		[31557600] = { 'year', 'years', "year's", "years'", unit = 'y' }
	}		}

Line 32:		Line 42:
	local auto_magnitude_num		local auto_magnitude_num
	local min_magnitude_num		local min_magnitude_num
⚫	local ~~result~~
	local result_unit
	local magnitude = args.magnitude		local magnitude = args.magnitude
	local min_magnitude = args.min_magnitude		local min_magnitude = args.min_magnitude
	local purge = args.purge		local purge = args.purge
⚫	local spell_out = args.spellout
⚫	local spell_out_max = args.spelloutmax

	-- Add a purge link if something (usually "yes") is entered into the purge parameter		-- Add a purge link if something (usually "yes") is entered into the purge parameter
Line 48:		Line 54:

	-- Check that the entered timestamp is valid. If it isn't, then give an error message.		-- Check that the entered timestamp is valid. If it isn't, then give an error message.
	local ~~noError~~, inputTime = pcall( lang.formatDate, lang, 'U', args[1]~~, true~~ )		local success, inputTime = pcall( lang.formatDate, lang, 'xnU', args[1] )
	if not ~~noError~~ then		if not success then
	return '<strong class="error">Error: first parameter cannot be parsed as a date or time.</strong>'		return '<strong class="error">Error: first parameter cannot be parsed as a date or time.</strong>'
	end		end

	-- Store the difference between the current time and the inputted time, as well as its absolute value.		-- Store the difference between the current time and the inputted time, as well as its absolute value.
	local timeDiff = lang:formatDate( 'U'~~, nil, true~~ ) - inputTime		local timeDiff = lang:formatDate( 'xnU' ) - inputTime
	local absTimeDiff = math.abs( timeDiff )		local absTimeDiff = math.abs( timeDiff )

Line 63:		Line 69:
	-- Calculate the appropriate unit of time if it was not specified as an argument.		-- Calculate the appropriate unit of time if it was not specified as an argument.
	local autoMagnitudeData = {		local autoMagnitudeData = {
	{ ~~denom~~ = ~~63115200~~, amn = 31557600 },		{ factor = 2, amn = 31557600 },
	{ ~~denom~~ = ~~5356800~~, amn = ~~2678400~~ },		{ factor = 2, amn = 2629800 },
	{ ~~denom~~ = ~~172800~~, amn = 86400 },		{ factor = 2, amn = 86400 },
	{ ~~denom~~ = ~~7200~~, amn = 3600 },		{ factor = 2, amn = 3600 },
	{ ~~denom~~ = ~~120~~, amn = 60 }		{ factor = 2, amn = 60 }
	}		}
	for i, t in ipairs( autoMagnitudeData ) do		for _, t in ipairs( autoMagnitudeData ) do
	if absTimeDiff / t.~~denom~~ >= 1 then		if absTimeDiff / t.amn >= t.factor then
	auto_magnitude_num = t.amn		auto_magnitude_num = t.amn
	break		break
Line 88:		Line 94:
	end		end

		⚫	local result_num
	local magnitude_num = math.max( min_magnitude_num, auto_magnitude_num )		local magnitude_num = math.max( min_magnitude_num, auto_magnitude_num )
			local unit = timeUnits[magnitude_num].unit
⚫	~~local~~ result_num = math.floor ( absTimeDiff / magnitude_num )
			if unit and absTimeDiff >= 864000 then
			local Date = require('Module:Date')._Date
			local input = lang:formatDate('Y-m-d H:i:s', args[1]) -- Date needs a clean date
			input = Date(input)
			if input then
			local id
			if input.hour == 0 and input.minute == 0 then
			id = 'currentdate'
			else
			id = 'currentdatetime'
			end
			result_num = (Date(id) - input):age(unit)
			end
			end
		⚫	result_num = result_num or math.floor ( absTimeDiff / magnitude_num )

	local punctuation_key, suffix		local punctuation_key, suffix
Line 120:		Line 142:
	end		end
	end		end
	result_unit = timeUnits[ magnitude_num ][ punctuation_key ]		local result_unit = timeUnits[ magnitude_num ][ punctuation_key ]

	-- Convert numerals to words if appropriate.		-- Convert numerals to words if appropriate.
		⚫	local spell_out = args.spellout
	spell_out_max = tonumber( spell_out_max ) -- Would cause script errors if not a number.
		⚫	local spell_out_max = tonumber(args.spelloutmax)
	local result_num_text		local result_num_text
	if ( spell_out == 'auto' and 1 <= result_num and result_num <= 9 and result_num <= ( spell_out_max or 9 ) )		if spell_out and (
			( spell_out == 'auto' and 1 <= result_num and result_num <= 9 and result_num <= ( spell_out_max or 9 ) ) or
	or ( yesno( spell_out ) and 1 <= result_num and result_num <= 100 and result_num <= ( spell_out_max or 100 ) )		( yesno( spell_out ) and 1 <= result_num and result_num <= 100 and result_num <= ( spell_out_max or 100 ) )
			)
	then		then
	result_num_text = numberSpell( result_num )		result_num_text = numberSpell( result_num )
Line 133:		Line 158:
	end		end

	result = result_num_text .. ' ' .. result_unit .. suffix -- Spaces for suffix have been added in earlier.		local result = result_num_text .. ' ' .. result_unit .. suffix -- Spaces for suffix have been added in earlier.
	return result .. purge		return result .. purge
	end		end

Johnuniq: fix unintended globals per Template talk:Time ago#Template-protected edit request on 26 March 2018

2018-03-27T00:32:43Z

fix unintended globals per Template talk:Time ago#Template-protected edit request on 26 March 2018

← Previous revision		Revision as of 00:32, 27 March 2018
Line 6:		Line 6:

	-- Table to convert entered text values to numeric values.		-- Table to convert entered text values to numeric values.
	timeText = {		local timeText = {
	['seconds'] = 1,		['seconds'] = 1,
	['minutes'] = 60,		['minutes'] = 60,
Line 17:		Line 17:

	-- Table containing tables of possible units to use in output.		-- Table containing tables of possible units to use in output.
	timeUnits = {		local timeUnits = {
	[1] = { 'second', 'seconds', "second's", "seconds'" },		[1] = { 'second', 'seconds', "second's", "seconds'" },
	[60] = { 'minute', 'minutes', "minutes'", "minutes'" },		[60] = { 'minute', 'minutes', "minutes'", "minutes'" },
Line 39:		Line 39:
	local spell_out = args.spellout		local spell_out = args.spellout
	local spell_out_max = args.spelloutmax		local spell_out_max = args.spelloutmax


	-- Add a purge link if something (usually "yes") is entered into the purge parameter		-- Add a purge link if something (usually "yes") is entered into the purge parameter
	if purge then		if purge then

Mr. Stradivarius: allow args.ago to suppress "time" in future dates, and do some refactoring

2015-07-09T14:09:32Z

allow args.ago to suppress "time" in future dates, and do some refactoring

Show changes

Mr. Stradivarius: add ability to spell out numbers with new parameters "spellout" and "spelloutmax"

2014-01-28T12:40:44Z

add ability to spell out numbers with new parameters "spellout" and "spelloutmax"

← Previous revision		Revision as of 12:40, 28 January 2014
Line 1:		Line 1:
	-- Replacement for [[Template:Time ago]]		-- Replacement for [[Template:Time ago]]
	local getArgs = require('Module:Arguments').getArgs		local getArgs = require('Module:Arguments').getArgs
			local numberSpell = require('Module:NumberSpell')._main
			local yesno = require('Module:Yesno')

	local p = {}		local p = {}
Line 30:		Line 32:
	local min_magnitude = args.min_magnitude		local min_magnitude = args.min_magnitude
	local purge = args.purge		local purge = args.purge
			local spell_out = args.spellout
			local spell_out_max = args.spelloutmax

	-- Generate the "ago" string. If ago is the blank string, do nothing - this allows overriding of args.ago		-- Generate the "ago" string. If ago is the blank string, do nothing - this allows overriding of args.ago
Line 48:		Line 52:

	-- Check that the entered timestamp is valid. If it isn't, then give an error message.		-- Check that the entered timestamp is valid. If it isn't, then give an error message.
	local noError, inputTime = pcall( lang.formatDate, lang, 'U', args[1] )		local noError, inputTime = pcall( lang.formatDate, lang, 'U', args[1], true )
	if not noError then		if not noError then
	return '<strong class="error">Error: first parameter cannot be parsed as a date or time.</strong>'		return '<strong class="error">Error: first parameter cannot be parsed as a date or time.</strong>'
Line 54:		Line 58:

	-- Store the difference between the current time and the inputted time, as well as its absolute value.		-- Store the difference between the current time and the inputted time, as well as its absolute value.
	local timeDiff = lang:formatDate( 'U' ) - inputTime		local timeDiff = lang:formatDate( 'U', nil, true ) - inputTime
	local absTimeDiff = math.abs( timeDiff )		local absTimeDiff = math.abs( timeDiff )

Line 63:		Line 67:
	-- Calculate the appropriate unit of time if it was not specified as an argument.		-- Calculate the appropriate unit of time if it was not specified as an argument.
	local autoMagnitudeData = {		local autoMagnitudeData = {
	{denom = 63115200, amn = 31557600},		{ denom = 63115200, amn = 31557600 },
	{denom = 5356800, amn = 2678400},		{ denom = 5356800, amn = 2678400 },
	{denom = 172800, amn = 86400},		{ denom = 172800, amn = 86400 },
	{denom = 7200, amn = 3600},		{ denom = 7200, amn = 3600 },
	{denom = 120, amn = 60}		{ denom = 120, amn = 60 }
	}		}
	for i, t in ipairs(autoMagnitudeData) do		for i, t in ipairs( autoMagnitudeData ) do
	if absTimeDiff / t.denom >= 1 then		if absTimeDiff / t.denom >= 1 then
	auto_magnitude_num = t.amn		auto_magnitude_num = t.amn
Line 91:		Line 95:
	local result_num = math.floor ( absTimeDiff / magnitude_num )		local result_num = math.floor ( absTimeDiff / magnitude_num )

			local punctuation_key, suffix
	if timeDiff >= 0 then -- Past		if timeDiff >= 0 then -- Past
	if result_num == 1 then		if result_num == 1 then
			punctuation_key = 1
⚫	result_unit = timeUnits[ magnitude_num ][1]
	else		else
			punctuation_key = 2
	result_unit = timeUnits[ magnitude_num ][2]
	end		end
			suffix = ago
⚫	result = ~~result_num~~ .. ' ' .. result_unit .. ~~ago~~ -- Spaces for ~~"ago"~~ ~~are~~ added earlier.
	else -- Future		else -- Future
	if result_num == 1 then		if result_num == 1 then
			punctuation_key = 3
	result_unit = timeUnits[ magnitude_num ][3]
	else		else
			punctuation_key = 4
	result_unit = timeUnits[ magnitude_num ][4]
	end		end
	~~result~~ = ~~result_num .. ' ' .. result_unit ..~~ ' time'		suffix = ' time'
	end		end
		⚫	result_unit = timeUnits[ magnitude_num ][ punctuation_key ]

			-- Convert numerals to words if appropriate.
			spell_out_max = tonumber( spell_out_max ) -- Would cause script errors if not a number.
			local result_num_text
			if ( spell_out == 'auto' and 1 <= result_num and result_num <= 9 and result_num <= ( spell_out_max or 9 ) )
			or ( yesno( spell_out ) and 1 <= result_num and result_num <= 100 and result_num <= ( spell_out_max or 100 ) )
			then
			result_num_text = numberSpell( result_num )
			else
			result_num_text = tostring( result_num )
			end

		⚫	result = result_num_text .. ' ' .. result_unit .. suffix -- Spaces for suffix have been added in earlier.
	return result .. purge		return result .. purge
	end		end

Mr. Stradivarius: allow blank values of |ago=

2014-01-13T05:12:48Z

allow blank values of |ago=

← Previous revision		Revision as of 05:12, 13 January 2014
Line 5:		Line 5:

	function p.main( frame )		function p.main( frame )
	local args = getArgs( frame )		local args = getArgs( frame, {
			valueFunc = function( k, v )
			if v then
			v = v:match( '^%s(.-)%s$' ) -- Trim whitespace.
			if k == 'ago' or v ~= '' then
			return v
			end
			end
			return nil
			end
			})
	return p._main( args )		return p._main( args )
	end		end
Line 12:		Line 22:
	-- Initialize variables		-- Initialize variables
	local lang = mw.language.getContentLanguage()		local lang = mw.language.getContentLanguage()
			local ago
	local auto_magnitude_num		local auto_magnitude_num
	local min_magnitude_num		local min_magnitude_num
Line 18:		Line 29:
	local magnitude = args.magnitude		local magnitude = args.magnitude
	local min_magnitude = args.min_magnitude		local min_magnitude = args.min_magnitude
⚫	~~local~~ ago = args.ago ~~or 'ago'~~
	local purge = args.purge		local purge = args.purge

			-- Generate the "ago" string. If ago is the blank string, do nothing - this allows overriding of args.ago
			-- in cases where the module is used to generate something like "where he has worked for the past 20 years."
		⚫	ago = args.ago
			if ago and ago ~= '' then
			ago = ' ' .. ago
			elseif not ago then
			ago = ' ago'
			end

	-- Add a purge link if something (usually "yes") is entered into the purge parameter		-- Add a purge link if something (usually "yes") is entered into the purge parameter
Line 78:		Line 97:
	result_unit = timeUnits[ magnitude_num ][2]		result_unit = timeUnits[ magnitude_num ][2]
	end		end
	result = result_num .. ' ' .. result_unit .. ' ' .. ago		result = result_num .. ' ' .. result_unit .. ago -- Spaces for "ago" are added earlier.
	else -- Future		else -- Future
	if result_num == 1 then		if result_num == 1 then

Mr. Stradivarius: Protected Module:TimeAgo: High-risk Lua module ([Edit=Allow only template editors and admins] (indefinite) [Move=Allow only template editors and admins] (indefinite))

2013-12-24T03:09:33Z

Protected Module:TimeAgo: High-risk Lua module ([Edit=Allow only template editors and admins] (indefinite) [Move=Allow only template editors and admins] (indefinite))

← Previous revision	Revision as of 03:09, 24 December 2013
(No difference)