Module:Duration - Revision history

Pppery: Fix error message per edit request

2020-05-11T14:05:19Z

Fix error message per edit request

← Previous revision		Revision as of 14:05, 11 May 2020
Line 2:		Line 2:

	function p._error( error_str )		function p._error( error_str )
	return '[[Category:Duration with input error]]<strong class="error">Error in Module:~~Hms~~: ' .. error_str .. '</strong>'		return '[[Category:Duration with input error]]<strong class="error">Error in Module:Duration: ' .. error_str .. '</strong>'
	end		end

DannyS712: DannyS712 moved page Module:Hms to Module:Duration without leaving a redirect: requested move; consensus at Module talk:Duration

2020-05-11T06:21:32Z

DannyS712 moved page Module:Hms to Module:Duration without leaving a redirect: requested move; consensus at Module talk:Duration

← Previous revision	Revision as of 06:21, 11 May 2020
(No difference)

MusikAnimal: Protected "Module:Hms": High-risk module ([Edit=Require template editor access] (indefinite))

2017-10-10T17:19:53Z

Protected "Module:Hms": High-risk module ([Edit=Require template editor access] (indefinite))

← Previous revision	Revision as of 17:19, 10 October 2017
(No difference)

Jc86035: doesn't work

2017-05-26T15:22:49Z

doesn't work

← Previous revision		Revision as of 15:22, 26 May 2017
Line 61:		Line 61:
	if duration ~= '' then tmp = duration end		if duration ~= '' then tmp = duration end
	end		end
	return tmp
	end

	function p.unformat(frame)
	local args = require('Module:Arguments').getArgs(frame)
	if not args[1] or args[1] == '' or mw.ustring.match(args[1], 'class="duration".*class="duration"') then return nil end
	local tmp = mw.ustring.gsub(mw.ustring.gsub(mw.ustring.gsub(mw.ustring.gsub(args[1], '<span class="h">([^/]+)</span>', '%1'), '<span class="min">([^/]+)</span>', '%1'), '<span class="s">([^/]+)</span>', '%1'), '<span class="duration">([^/]+)</span>', '%1')
	return tmp		return tmp
	end		end

Jc86035 at 15:19, 26 May 2017

2017-05-26T15:19:00Z

← Previous revision		Revision as of 15:19, 26 May 2017
Line 67:		Line 67:
	local args = require('Module:Arguments').getArgs(frame)		local args = require('Module:Arguments').getArgs(frame)
	if not args[1] or args[1] == '' or mw.ustring.match(args[1], 'class="duration".*class="duration"') then return nil end		if not args[1] or args[1] == '' or mw.ustring.match(args[1], 'class="duration".*class="duration"') then return nil end
	~~return~~ mw.ustring.gsub(mw.ustring.gsub(mw.ustring.gsub(mw.ustring.gsub(args[1], '<span class="h">([^/]+)</span>', '%1'), '<span class="min">([^/]+)</span>', '%1'), '<span class="s">([^/]+)</span>', '%1 2'), '<span class="duration">([^/]+)</span>', '%1')		local tmp = mw.ustring.gsub(mw.ustring.gsub(mw.ustring.gsub(mw.ustring.gsub(args[1], '<span class="h">([^/]+)</span>', '%1'), '<span class="min">([^/]+)</span>', '%1'), '<span class="s">([^/]+)</span>', '%1'), '<span class="duration">([^/]+)</span>', '%1')
			return tmp
	end		end

Jc86035: ?

2017-05-26T15:18:01Z

← Previous revision		Revision as of 15:18, 26 May 2017
Line 67:		Line 67:
	local args = require('Module:Arguments').getArgs(frame)		local args = require('Module:Arguments').getArgs(frame)
	if not args[1] or args[1] == '' or mw.ustring.match(args[1], 'class="duration".*class="duration"') then return nil end		if not args[1] or args[1] == '' or mw.ustring.match(args[1], 'class="duration".*class="duration"') then return nil end
	return mw.ustring.gsub(mw.ustring.gsub(mw.ustring.gsub(mw.ustring.gsub(args[1], '<span class="h">([^/]+)</span>', '%1'), '<span class="min">([^/]+)</span>', '%1'), '<span class="s">([^/]+)</span>', '%1'), '<span class="duration">([^/]+)</span>', '%1')		return mw.ustring.gsub(mw.ustring.gsub(mw.ustring.gsub(mw.ustring.gsub(args[1], '<span class="h">([^/]+)</span>', '%1'), '<span class="min">([^/]+)</span>', '%1'), '<span class="s">([^/]+)</span>', '%1 2'), '<span class="duration">([^/]+)</span>', '%1')
	end		end

Jc86035 at 15:13, 26 May 2017

2017-05-26T15:13:38Z

← Previous revision		Revision as of 15:13, 26 May 2017
Line 67:		Line 67:
	local args = require('Module:Arguments').getArgs(frame)		local args = require('Module:Arguments').getArgs(frame)
	if not args[1] or args[1] == '' or mw.ustring.match(args[1], 'class="duration".*class="duration"') then return nil end		if not args[1] or args[1] == '' or mw.ustring.match(args[1], 'class="duration".*class="duration"') then return nil end
	return mw.ustring.gsub(mw.ustring.gsub(mw.ustring.gsub(args[1], '<span class="~~min~~">([^/]+)</span>', '%1'), '<span class="[hs]">([^/]+)</span>', '%1'), '<span class="duration">([^/]+)</span>', '%1')		return mw.ustring.gsub(mw.ustring.gsub(mw.ustring.gsub(mw.ustring.gsub(args[1], '<span class="h">([^/]+)</span>', '%1'), '<span class="min">([^/]+)</span>', '%1'), '<span class="s">([^/]+)</span>', '%1'), '<span class="duration">([^/]+)</span>', '%1')
	end		end

Jc86035: add unformatter

2017-05-26T15:12:45Z

add unformatter

← Previous revision		Revision as of 15:12, 26 May 2017
Line 62:		Line 62:
	end		end
	return tmp		return tmp
			end

			function p.unformat(frame)
			local args = require('Module:Arguments').getArgs(frame)
			if not args[1] or args[1] == '' or mw.ustring.match(args[1], 'class="duration".*class="duration"') then return nil end
			return mw.ustring.gsub(mw.ustring.gsub(mw.ustring.gsub(args[1], '<span class="min">([^/]+)</span>', '%1'), '<span class="[hs]">([^/]+)</span>', '%1'), '<span class="duration">([^/]+)</span>', '%1')
	end		end

Jc86035: new error category

2017-05-24T08:23:19Z

new error category

← Previous revision		Revision as of 08:23, 24 May 2017
Line 1:		Line 1:
	local p = {}		local p = {}

			function p._error( error_str )
			return '[[Category:Duration with input error]]<strong class="error">Error in Module:Hms: ' .. error_str .. '</strong>'
			end

	function p.main(frame)		function p.main(frame)
Line 6:		Line 10:
	local duration = {}		local duration = {}
	if tonumber(args[1]) or args[2] or args[3] then		if tonumber(args[1]) or args[2] or args[3] then
	if args[4] then ~~error~~('Parameter number 4 should not be specified') end		if args[4] then return p._error('Parameter number 4 should not be specified') end
	if not args[1] or args[1] == '' then		if not args[1] or args[1] == '' then
	duration = {args[2] or 0, args[3] or 0}		duration = {args[2] or 0, args[3] or 0}
Line 15:		Line 19:
	for k, v in ipairs(duration) do		for k, v in ipairs(duration) do
	duration[k] = tonumber(v)		duration[k] = tonumber(v)
	if not duration[k] then ~~error~~('Invalid values') end		if not duration[k] then return p._error('Invalid values') end
	end		end
	elseif args.h or args.m or args.s then		elseif args.h or args.m or args.s then
Line 26:		Line 30:
	for k, v in ipairs(duration) do		for k, v in ipairs(duration) do
	duration[k] = tonumber(v)		duration[k] = tonumber(v)
	if not duration[k] then ~~error~~('Invalid values') end		if not duration[k] then return p._error('Invalid values') end
	end		end
	else		else
	if mw.ustring.find(tmp, 'class="duration"', 1, yes) then return tmp end -- if there is already a microformat, don't do anything		if mw.ustring.find(tmp, 'class="duration"', 1, yes) then return tmp end -- if there is already a microformat, don't do anything
	duration = mw.text.split(mw.ustring.match(tmp, '%d:?%d+:%d+%.?%d') or '', ':') -- split into table		duration = mw.text.split(mw.ustring.match(tmp, '%d:?%d+:%d+%.?%d') or '', ':') -- split into table
	if duration[4] then ~~error~~('Maximum of two colons allowed') end		if duration[4] then return p._error('Maximum of two colons allowed') end
	for k, v in ipairs(duration) do duration[k] = tonumber(v) or 0 end -- convert values to numbers		for k, v in ipairs(duration) do duration[k] = tonumber(v) or 0 end -- convert values to numbers
	end		end
	if duration[3] then		if duration[3] then
	if (duration[1] + duration[2] + duration[3]) == 0 then return nil end		if (duration[1] + duration[2] + duration[3]) == 0 then return nil end
	if (duration[1] ~= math.ceil(duration[1])) or (duration[2] ~= math.ceil(duration[2])) then ~~error~~('Hours and minutes values must be integers') end		if (duration[1] ~= math.ceil(duration[1])) or (duration[2] ~= math.ceil(duration[2])) then return p._error('Hours and minutes values must be integers') end
	if duration[3] >= 60 then ~~error~~('Seconds value must be less than 60') end		if duration[3] >= 60 then return p._error('Seconds value must be less than 60') end
	if duration[2] >= 60 then ~~error~~('Minutes value must be less than 60 if hours value is specified') end		if duration[2] >= 60 then return p._error('Minutes value must be less than 60 if hours value is specified') end
	if duration[2] < 10 then duration[2] = '0'..duration[2] end -- zero padding		if duration[2] < 10 then duration[2] = '0'..duration[2] end -- zero padding
	if duration[3] < 10 then duration[3] = '0'..duration[3] end		if duration[3] < 10 then duration[3] = '0'..duration[3] end
Line 44:		Line 48:
	elseif duration[2] then		elseif duration[2] then
	if (duration[1] + duration[2]) == 0 then return nil end		if (duration[1] + duration[2]) == 0 then return nil end
	if duration[1] ~= math.ceil(duration[1]) then ~~error~~('Hours and minutes values must be integers') end		if duration[1] ~= math.ceil(duration[1]) then return p._error('Hours and minutes values must be integers') end
	if duration[2] >= 60 then ~~error~~('Seconds value must be less than 60') end		if duration[2] >= 60 then return p._error('Seconds value must be less than 60') end
	if duration[2] < 10 then duration[2] = '0'..duration[2] end -- zero padding		if duration[2] < 10 then duration[2] = '0'..duration[2] end -- zero padding
	duration = '<span class="duration"><span class="min">' .. duration[1] .. '</span>:<span class="s">' .. duration[2] .. '</span></span>'		duration = '<span class="duration"><span class="min">' .. duration[1] .. '</span>:<span class="s">' .. duration[2] .. '</span></span>'

Jc86035 at 15:57, 23 May 2017

2017-05-23T15:57:30Z

← Previous revision		Revision as of 15:57, 23 May 2017
Line 53:		Line 53:

	if tmp and tmp ~= '' then		if tmp and tmp ~= '' then
	if duration ~= '' then tmp = mw.ustring.gsub(tmp, '%d:?%d+:%d+%.?%d', duration, 1) else tmp = tmp .. '[[Category:Duration without hAudio microformat]]' end		if duration ~= '' then tmp = mw.ustring.gsub(tmp, '%d:?%d+:%d+%.?%d', duration, 1) else tmp = tmp .. ' [[Category:Duration without hAudio microformat]]' end
	else		else
	if duration ~= '' then tmp = duration end		if duration ~= '' then tmp = duration end