Module:UnitPlural - Revision history

Uzume: avoid "preprocess" where not needed as it needlessly increases preprocessor visited node count and post-expand include size

2023-02-16T04:20:27Z

avoid "preprocess" where not needed as it needlessly increases preprocessor visited node count and post-expand include size

← Previous revision		Revision as of 04:20, 16 February 2023
Line 44:		Line 44:
	langobj = mw.language.new(langcode)		langobj = mw.language.new(langcode)
	else		else
	langcode = mw.getCurrentFrame():~~preprocess~~( '~~{{int:~~lang}}' )		langcode = mw.getCurrentFrame():callParserFunction('int', {'lang'})
	if mw.language.isKnownLanguageTag(langcode) then		if mw.language.isKnownLanguageTag(langcode) then
	langobj = mw.language.new(langcode)		langobj = mw.language.new(langcode)

RexxS: pl is now exported as p.pl

2019-10-14T14:57:41Z

pl is now exported as p.pl

← Previous revision		Revision as of 14:57, 14 October 2019
Line 76:		Line 76:
	if u1 then		if u1 then
	-- recurse to give plural of bit before " per "		-- recurse to give plural of bit before " per "
	ret = pl(u1) .. " per " .. u2		ret = p.pl(u1) .. " per " .. u2
	else		else
	-- standard plural		-- standard plural

RexxS: RexxS moved page Module:Sandbox/RexxS/Plural to Module:UnitPlural without leaving a redirect: ready for main modukle space

2019-10-14T14:36:36Z

RexxS moved page Module:Sandbox/RexxS/Plural to Module:UnitPlural without leaving a redirect: ready for main modukle space

← Previous revision	Revision as of 14:36, 14 October 2019
(No difference)

RexxS: need to match floats as well

2019-10-14T14:32:05Z

need to match floats as well

← Previous revision		Revision as of 14:32, 14 October 2019
Line 96:		Line 96:
	--]]		--]]
	function p.plural(quant, langcode)		function p.plural(quant, langcode)
	local num, unit = quant:match("(%d+)%A+(.*)")		local num, unit = quant:match("([%d%.,]+)%A+(.*)")
	if tonumber(num) == 1 then		if tonumber(num) == 1 then
	return num .. " " .. unit		return num .. " " .. unit

RexxS: expand module to process quantities (number + unit name)

2019-10-14T14:24:43Z

expand module to process quantities (number + unit name)

← Previous revision		Revision as of 14:24, 14 October 2019
Line 3:		Line 3:
	Might be split into code and data		Might be split into code and data
	--]]		--]]


	--[[		--[[
Line 29:		Line 30:
	},		},
	}		}


	--[[		--[[
Line 51:		Line 53:
	return langobj		return langobj
	end		end


	local p = {}		local p = {}


	--[[		--[[
Line 84:		Line 88:
	return ret		return ret
	end		end


	--[[		--[[
	p.~~main~~ takes a unit name and an optional language code ~~from the frame or its parent.~~		p.plural takes a quantity (number and unit name) and an optional language code
	It returns the ~~plural~~ of ~~that~~ ~~unit~~ in the given language, if it can.		It returns the quantity with proper plural units in the given language, if it can.
			it is exported for use in other modules.
			--]]
			function p.plural(quant, langcode)
			local num, unit = quant:match("(%d+)%A+(.*)")
			if tonumber(num) == 1 then
			return num .. " " .. unit
			else
			return num .. " " .. p.pl(unit, langcode)
			end
			end


			--[[
			p.main takes a number and unit name (quantity=) and an optional language code (lang=) from the frame
			It returns the quantity with proper plural units in the given language, if it can.
			Example use: {{#invoke:Sandbox/RexxS/Plural\|main\|quantity=3 week}} returns "3 weeks"
	--]]		--]]
	function p.main(frame)		function p.main(frame)
	if ~~frame.~~args~~.unit~~ ~~then~~		local args = {}
			if frame.args.quantity then
	args = frame.args		args = frame.args
	else		else
	args = frame:getParent().args		args = frame:getParent().args
	end		end
⚫	-- if nothing supplied, return nothing (or an error message if debugging)
⚫	if not args.~~unit~~ then return "" end

		⚫	-- if nothing supplied, return nothing (or add an error message if debugging)
⚫	return p.pl(args.~~unit~~, args.lang)
		⚫	if not args.quantity then return "" end

		⚫	return p.plural(args.quantity, args.lang)
	end		end

RexxS: export function for use in other modules

2019-10-14T13:49:11Z

export function for use in other modules

← Previous revision		Revision as of 13:49, 14 October 2019
Line 1:		Line 1:
			--[[
	-- Module to create plurals for units (initially)		Module to create plurals for units (initially)
	-- Might be split into code and data		Might be split into code and data
			--]]

	--[[		--[[
Line 49:		Line 51:
	return langobj		return langobj
	end		end

		⚫	local p = {}

	--[[		--[[
	pl takes a unit name and an optional language code		p.pl takes a unit name and an optional language code
	It returns the plural of that unit in the given language, if it can.		It returns the plural of that unit in the given language, if it can.
			it is exported for use in other modules.
	--]]		--]]
	~~local~~ function pl(unit, langcode)		function p.pl(unit, langcode)
	langcode = findLang(langcode).code		langcode = findLang(langcode).code
	unit = tostring(unit) or ""		unit = tostring(unit) or ""
Line 79:		Line 84:
	return ret		return ret
	end		end

⚫	local p = {}

	--[[		--[[
Line 95:		Line 98:
	if not args.unit then return "" end		if not args.unit then return "" end

	return pl(args.unit, args.lang)		return p.pl(args.unit, args.lang)
	end		end

StraussInTheHouse: StraussInTheHouse moved page Module:RexxS/Plural to Module:Sandbox/RexxS/Plural without leaving a redirect: Per consensus at 875507098.

2018-12-27T02:04:21Z

StraussInTheHouse moved page Module:RexxS/Plural to Module:Sandbox/RexxS/Plural without leaving a redirect: Per consensus at 875507098.

← Previous revision	Revision as of 02:04, 27 December 2018
(No difference)

RexxS: rm debugging

2018-10-10T20:18:10Z

rm debugging

← Previous revision		Revision as of 20:18, 10 October 2018
Line 60:		Line 60:
	if plural[langcode] then		if plural[langcode] then
	if plural[langcode][unit] then		if plural[langcode][unit] then
			-- irregular plural from lookup
	ret = plural[langcode][unit]		ret = plural[langcode][unit]
	else		else
Line 67:		Line 68:
	-- recurse to give plural of bit before " per "		-- recurse to give plural of bit before " per "
	ret = pl(u1) .. " per " .. u2		ret = pl(u1) .. " per " .. u2
	-- ret = "Debug:" .. " 2=" .. (u2 or "zilch") .. " 1=" .. pl(u1, langcode) .. " per=" .. per
	else		else
	-- standard plural		-- standard plural
Line 74:		Line 74:
	end		end
	else		else
	~~ret = "Debug:~~ unknown language " .. ~~unit~~		-- unknown language, so return unchanged
			ret = unit
	end		end
	return ret		return ret
Line 91:		Line 92:
	args = frame:getParent().args		args = frame:getParent().args
	end		end
			-- if nothing supplied, return nothing (or an error message if debugging)
	if not args.unit then return "~~Debug: Nothing supplied~~" end		if not args.unit then return "" end

	return pl(args.unit, args.lang)		return pl(args.unit, args.lang)

RexxS: local u1,2

2018-10-10T20:14:00Z

local u1,2

← Previous revision		Revision as of 20:14, 10 October 2018
Line 63:		Line 63:
	else		else
	local per = plural[langcode].per		local per = plural[langcode].per
	u1, u2 = unit:match("(.+) " .. per .. " (.+)")		local u1, u2 = unit:match("(.+) " .. per .. " (.+)")
	if u1 then		if u1 then
	-- recurse to give plural of bit before " per "		-- recurse to give plural of bit before " per "
	-- ret = pl(u1) .. " per " .. u2		ret = pl(u1) .. " per " .. u2
	ret = "Debug:" .. " 2=" .. (u2 or "zilch") .. " 1=" .. pl(u1, langcode) .. " per=" .. per		-- ret = "Debug:" .. " 2=" .. (u2 or "zilch") .. " 1=" .. pl(u1, langcode) .. " per=" .. per
	else		else
	-- standard plural		-- standard plural

RexxS: debug

2018-10-10T20:12:11Z

debug

← Previous revision		Revision as of 20:12, 10 October 2018
Line 67:		Line 67:
	-- recurse to give plural of bit before " per "		-- recurse to give plural of bit before " per "
	-- ret = pl(u1) .. " per " .. u2		-- ret = pl(u1) .. " per " .. u2
	ret = "Debug: 1=" .. pl(u1) .. " ~~per~~=" .. ~~per~~ .. " 2=" .. ~~(u2 or "zilch")~~		ret = "Debug:" .. " 2=" .. (u2 or "zilch") .. " 1=" .. pl(u1, langcode) .. " per=" .. per
	else		else
	-- standard plural		-- standard plural