Module:IPA - Revision history

Nardog: bugfixes

2024-12-27T10:23:34Z

bugfixes

← Previous revision		Revision as of 10:23, 27 December 2024
Line 63:		Line 63:
	end		end

	local function ~~getLangName~~(~~code, link~~)		local function splitTag(s)
		⚫	local langCode = s:gsub('%-.*', ''):lower()
		⚫	langCode = resolveSynonym(langCode)
		⚫	local regionCode = s:match('%-(.+)')
		⚫	local isPrivate = regionCode and regionCode:sub(1, 2) == 'x-'
			return langCode, regionCode, isPrivate
			end

			local function getLangName(code, link, raw)
	return require('Module:Lang')._name_from_tag({		return require('Module:Lang')._name_from_tag({
	code,		code,
	link = link,		link = link,
			raw = raw,
	-- Without linking, "{{IPA}}" gets expanded in some contexts		-- Without linking, "{{IPA}}" gets expanded in some contexts
	template = '[[Template:IPA\|IPA]]'		template = '[[Template:IPA\|IPA]]'
Line 83:		Line 92:
	local ret, cats = {}, {}		local ret, cats = {}, {}
	local isDebug = args.debug == 'yes'		local isDebug = args.debug == 'yes'
	local s, langCode, ~~isPrivate~~, ~~fullLangCode~~		local s, langCode, regionCode, isPrivate

	-- Guide-linking mode		-- Guide-linking mode
Line 90:		Line 99:
	local isGeneric = args.generic == 'yes'		local isGeneric = args.generic == 'yes'
	s = args[2]		s = args[2]
			langCode, regionCode, isPrivate = splitTag(args[1])

	-- Split tag into language and region codes
⚫	langCode = ~~args[1]~~:gsub('%-.*', ''):lower()
⚫	langCode = resolveSynonym(langCode)
⚫	local regionCode = ~~args[1]~~:match('%-(.+)')
	local langData = data.langs[langCode] or {}		local langData = data.langs[langCode] or {}
	if regionCode then		if regionCode then
⚫	isPrivate = regionCode:sub(1, 2) == 'x-'
	if not isPrivate then		if not isPrivate then
	regionCode = regionCode:upper()		regionCode = regionCode:upper()
Line 113:		Line 117:
	-- Use the canonical region code		-- Use the canonical region code
	regionCode = dialectData.aliasOf		regionCode = dialectData.aliasOf
			isPrivate = regionCode:sub(1, 2) == 'x-'
	dialectData = langData.dialects[regionCode]		dialectData = langData.dialects[regionCode]
	end		end
Line 126:		Line 131:
	isGeneric = true		isGeneric = true
	end		end
⚫	fullLangCode = langCode .. '-' .. regionCode
⚫	else
⚫	~~fullLangCode =~~ langCode
	end		end

		⚫	local fullLangCode = regionCode and langCode .. '-' .. regionCode
		⚫	or langCode
	local langName = langData.name		local langName = langData.name
	and linkLang(langData.name, langData.link, args.link)		and linkLang(langData.name, langData.link, args.link)
Line 139:		Line 143:
	end		end
	if args.cat ~= 'no' then		if args.cat ~= 'no' then
	local catLangName = ~~args~~.~~link == 'yes'~~		local catLangName = langData.name
			or getLangName(fullLangCode, nil, 'yes')
	and mw.ustring.match(langName, '([^%[\|%]]+)%]%]$')
			if catLangName:sub(1, 5) == '<span' then
	or langName
			-- Module:Lang has returned an error, but it's not fatal
⚫	table.insert(cats, string.format('Pages with %s IPA', catLangName))
			table.insert(cats, 'IPA template errors')
			mw.addWarning(catLangName)
		⚫	else
		⚫	table.insert(cats, string.format('Pages with %s IPA', catLangName))
			end
	end		end

Line 202:		Line 211:
	-- Basic mode		-- Basic mode
	s = args[1]		s = args[1]
		⚫	if args.lang and args.lang ~= '' then
			langCode, regionCode, isPrivate = splitTag(args.lang)
			end
	if args.cat ~= 'no' then		if args.cat ~= 'no' then
	table.insert(cats, 'Pages with plain IPA')		table.insert(cats, 'Pages with plain IPA')
Line 209:		Line 221:
	-- Transcription		-- Transcription
	do		do
	local lang = ~~isPrivate and~~ langCode or ~~fullLangCode~~ or		local lang = (langCode or 'und') .. '-Latn'
			if not isPrivate and regionCode then
⚫	args.lang ~~~= ''~~ and args.lang or '~~und~~'
			lang = lang .. '-' .. regionCode
			end
			lang = lang .. '-fonipa'
	local span = mw.html.create('span')		local span = mw.html.create('span')
	:addClass('IPA')		:addClass('IPA')
	:addClass(args.class)		:addClass(args.class)
	:attr('lang', lang ~~.. '-Latn-fonipa'~~)		:attr('lang', lang)
	-- wrap=all: Do nothing		-- wrap=all: Do nothing
	-- wrap=none: Never break		-- wrap=none: Never break

Nardog: no private tags in output

2023-10-21T11:57:26Z

no private tags in output

← Previous revision		Revision as of 11:57, 21 October 2023
Line 83:		Line 83:
	local ret, cats = {}, {}		local ret, cats = {}, {}
	local isDebug = args.debug == 'yes'		local isDebug = args.debug == 'yes'
	local s, fullLangCode		local s, langCode, isPrivate, fullLangCode

	-- Guide-linking mode		-- Guide-linking mode
Line 92:		Line 92:

	-- Split tag into language and region codes		-- Split tag into language and region codes
	~~local~~ langCode = args[1]:gsub('%-.*', ''):lower()		langCode = args[1]:gsub('%-.*', ''):lower()
	langCode = resolveSynonym(langCode)		langCode = resolveSynonym(langCode)
	local regionCode = args[1]:match('%-(.+)')		local regionCode = args[1]:match('%-(.+)')
	local langData = data.langs[langCode] or {}		local langData = data.langs[langCode] or {}
	if regionCode then		if regionCode then
	if regionCode:sub(1, 2) ~= 'x-' ~~then~~		isPrivate = regionCode:sub(1, 2) == 'x-'
			if not isPrivate then
	regionCode = regionCode:upper()		regionCode = regionCode:upper()
	end		end
Line 208:		Line 209:
	-- Transcription		-- Transcription
	do		do
	local lang = ~~fullLangCode~~ or ~~args.lang~~ ~= ~~'' and args.lang~~ or ~~'und'~~		local lang = isPrivate and langCode or fullLangCode or
			args.lang ~= '' and args.lang or 'und'
	local span = mw.html.create('span')		local span = mw.html.create('span')
	:addClass('IPA')		:addClass('IPA')

Nardog: refactor

2023-09-26T08:29:19Z

refactor

← Previous revision		Revision as of 08:29, 26 September 2023
Line 95:		Line 95:
	langCode = resolveSynonym(langCode)		langCode = resolveSynonym(langCode)
	local regionCode = args[1]:match('%-(.+)')		local regionCode = args[1]:match('%-(.+)')
⚫	if ~~regionCode and~~ regionCode:sub(1, 2) ~= 'x-' then
⚫	regionCode = regionCode:upper()
⚫	end
	local langData = data.langs[langCode] or {}		local langData = data.langs[langCode] or {}
	if regionCode then		if regionCode then
		⚫	if regionCode:sub(1, 2) ~= 'x-' then
		⚫	regionCode = regionCode:upper()
		⚫	end
	if langData.dialects and langData.dialects[regionCode] then		if langData.dialects and langData.dialects[regionCode] then
	-- Overwrite language data with the dialect's		-- Overwrite language data with the dialect's
Line 125:		Line 125:
	isGeneric = true		isGeneric = true
	end		end
		⚫	fullLangCode = langCode .. '-' .. regionCode
			else
			fullLangCode = langCode
	end		end
⚫	fullLangCode = ~~regionCode and~~ langCode .. '-' .. regionCode ~~or langCode~~

	local langName = langData.name		local langName = langData.name
Line 200:		Line 202:
	s = args[1]		s = args[1]
	if args.cat ~= 'no' then		if args.cat ~= 'no' then
	table.insert(cats, ~~args.cat or~~ 'Pages with plain IPA')		table.insert(cats, 'Pages with plain IPA')
	end		end
	end		end
Line 233:		Line 235:
	if audio then		if audio then
	local button = mw.getCurrentFrame():expandTemplate({		local button = mw.getCurrentFrame():expandTemplate({
	title = '~~Template:~~Audio',		title = 'Audio',
	args = { audio, '' }		args = { audio, '' }
	})		})

Nardog: default to generic if dialect not defined in data

2023-09-21T05:26:00Z

default to generic if dialect not defined in data

← Previous revision		Revision as of 05:26, 21 September 2023
Line 88:		Line 88:
	if args[2] and args[2] ~= '' then		if args[2] and args[2] ~= '' then
	local data = mw.loadData('Module:IPA/data')		local data = mw.loadData('Module:IPA/data')
			local isGeneric = args.generic == 'yes'
	s = args[2]		s = args[2]

Line 98:		Line 99:
	end		end
	local langData = data.langs[langCode] or {}		local langData = data.langs[langCode] or {}
	if regionCode ~~and~~ langData.dialects and langData.dialects[regionCode] then		if regionCode then
			if langData.dialects and langData.dialects[regionCode] then
	-- Overwrite language data with the dialect's		-- Overwrite language data with the dialect's
	local newLangData = {}		local newLangData = {}
	for k, v in pairs(langData) do		for k, v in pairs(langData) do
	if k ~= 'dialects' then		if k ~= 'dialects' then
		⚫	newLangData[k] = v
		⚫	end
		⚫	end
		⚫	local dialectData = langData.dialects[regionCode]
		⚫	if dialectData.aliasOf then
		⚫	-- Use the canonical region code
		⚫	regionCode = dialectData.aliasOf
		⚫	dialectData = langData.dialects[regionCode]
		⚫	end
		⚫	-- Lowercase IANA variant
		⚫	if dialectData.isVariant then
		⚫	regionCode = regionCode:lower()
			end
		⚫	for k, v in pairs(dialectData) do
	newLangData[k] = v		newLangData[k] = v
	end		end
		⚫	langData = newLangData
			else
			isGeneric = true
	end		end
⚫	local dialectData = langData.dialects[regionCode]
⚫	if dialectData.aliasOf then
⚫	-- Use the canonical region code
⚫	regionCode = dialectData.aliasOf
⚫	dialectData = langData.dialects[regionCode]
⚫	end
⚫	-- Lowercase IANA variant
⚫	if dialectData.isVariant then
⚫	regionCode = regionCode:lower()
⚫	end
⚫	for k, v in pairs(dialectData) do
⚫	newLangData[k] = v
⚫	end
⚫	langData = newLangData
	end		end
	fullLangCode = regionCode and langCode .. '-' .. regionCode or langCode		fullLangCode = regionCode and langCode .. '-' .. regionCode or langCode
Line 131:		Line 136:
	end		end
	if args.cat ~= 'no' then		if args.cat ~= 'no' then
	local catLangName = ~~langCode~~ == '~~und' and 'undetermined~~'		local catLangName = args.link == 'yes'
	~~or args.link == 'yes'~~ and mw.ustring.match(langName, '([^%[\|%]]+)%]%]$')		and mw.ustring.match(langName, '([^%[\|%]]+)%]%]$')
	or langName		or langName
	table.insert(cats, string.format('Pages with %s IPA', catLangName))		table.insert(cats, string.format('Pages with %s IPA', catLangName))
Line 186:		Line 191:

	-- Brackets		-- Brackets
	s = (~~args.generic~~ ~~~= 'yes'~~ and langData.format or '[%s]'):format(s)		s = (not isGeneric and langData.format or '[%s]'):format(s)

	-- Link to key		-- Link to key
	local key = ~~args.generic~~ ~~~= 'yes'~~ and langData.key or data.defaultKey		local key = not isGeneric and langData.key or data.defaultKey
	s = string.format('[[%s\|%s]]', key, s)		s = string.format('[[%s\|%s]]', key, s)
	else		else

Nardog: allow ca-valencia and private-use tags

2023-09-20T17:10:21Z

allow ca-valencia and private-use tags

← Previous revision		Revision as of 17:10, 20 September 2023
Line 93:		Line 93:
	local langCode = args[1]:gsub('%-.*', ''):lower()		local langCode = args[1]:gsub('%-.*', ''):lower()
	langCode = resolveSynonym(langCode)		langCode = resolveSynonym(langCode)
	local regionCode = (args[1]:match('%-(.+)'~~) or ''):upper(~~)		local regionCode = args[1]:match('%-(.+)')
			if regionCode and regionCode:sub(1, 2) ~= 'x-' then
			regionCode = regionCode:upper()
			end
	local langData = data.langs[langCode] or {}		local langData = data.langs[langCode] or {}
	if langData.dialects and langData.dialects[regionCode] then		if regionCode and langData.dialects and langData.dialects[regionCode] then
	-- Overwrite language data with the dialect's		-- Overwrite language data with the dialect's
	local newLangData = {}		local newLangData = {}
Line 108:		Line 111:
	regionCode = dialectData.aliasOf		regionCode = dialectData.aliasOf
	dialectData = langData.dialects[regionCode]		dialectData = langData.dialects[regionCode]
			end
			-- Lowercase IANA variant
			if dialectData.isVariant then
			regionCode = regionCode:lower()
	end		end
	for k, v in pairs(dialectData) do		for k, v in pairs(dialectData) do
Line 114:		Line 121:
	langData = newLangData		langData = newLangData
	end		end
	fullLangCode = regionCode ~= ''		fullLangCode = regionCode and langCode .. '-' .. regionCode or langCode
	and langCode .. '-' .. regionCode
	or langCode

	local langName = langData.name		local langName = langData.name
Line 141:		Line 146:
	else		else
	local langText		local langText
	if langData.text ~~and args.link == 'yes'~~ then		if langData.text then
	langText = ~~string.format~~(		langText = linkLang(
	~~'[[%s\|%s]]'~~,		langData.text,
	mw.ustring.match(langName, '^%[%[([^\|%]]+)'),		mw.ustring.match(langName, '^%[%[([^\|%]]+)'),
	~~langData~~.~~text~~		args.link
	)		)
	elseif langData.text then
	langText = langData.text
	else		else
	langText = mw.ustring.gsub(		langText = mw.ustring.gsub(

Nardog: add tracking category by language; use numeric character reference to avoid ill-formatted links

2023-09-19T03:15:44Z

add tracking category by language; use numeric character reference to avoid ill-formatted links

← Previous revision		Revision as of 03:15, 19 September 2023
Line 124:		Line 124:
	-- Module:Lang has returned an error		-- Module:Lang has returned an error
	return langName .. renderCats({ 'IPA template errors' }, isDebug)		return langName .. renderCats({ 'IPA template errors' }, isDebug)
			end
			if args.cat ~= 'no' then
			local catLangName = langCode == 'und' and 'undetermined'
			or args.link == 'yes' and mw.ustring.match(langName, '([^%[\|%]]+)%]%]$')
			or langName
			table.insert(cats, string.format('Pages with %s IPA', catLangName))
	end		end

Line 177:		Line 183:

	-- Brackets		-- Brackets
	s = (args.generic ~= 'yes' and langData.format or '[%s]'):format(s)		s = (args.generic ~= 'yes' and langData.format or '[%s]'):format(s)

	-- Link to key		-- Link to key
Line 185:		Line 191:
	-- Basic mode		-- Basic mode
	s = args[1]		s = args[1]
			if args.cat ~= 'no' then
			table.insert(cats, args.cat or 'Pages with plain IPA')
			end
	end		end

Nardog: brackets if generic=yes

2023-09-17T04:39:32Z

brackets if generic=yes

← Previous revision		Revision as of 04:39, 17 September 2023
Line 177:		Line 177:

	-- Brackets		-- Brackets
	s = (langData.format or '[%s]'):format(s)		s = (args.generic ~= 'yes' and langData.format or '[%s]'):format(s)

	-- Link to key		-- Link to key

Nardog: handle "languages" better

2023-09-17T02:54:25Z

handle "languages" better

← Previous revision		Revision as of 02:54, 17 September 2023
Line 63:		Line 63:
	end		end

	local function getLangName(~~fullLangCode~~, link)		local function getLangName(code, link)
	return require('Module:Lang')._name_from_tag({		return require('Module:Lang')._name_from_tag({
			code,
	fullLangCode,
	link = link,		link = link,
			-- Without linking, "{{IPA}}" gets expanded in some contexts
	template = '[[Template:IPA\|IPA]]'		template = '[[Template:IPA\|IPA]]'
	})		})
	end		end

	local function linkLang(~~label~~, target, link)		local function linkLang(name, target, link)
	return link == 'yes' and string.format(		return link == 'yes' and string.format(
	'[[%s\|%s]]',		'[[%s\|%s]]',
	target or ~~label~~ .. ' language',		target or name .. ' language',
	~~label~~		name
	) or ~~label~~		) or name
	end		end

Line 113:		Line 114:
	langData = newLangData		langData = newLangData
	end		end
⚫
	fullLangCode = regionCode ~= ''		fullLangCode = regionCode ~= ''
	and langCode .. '-' .. regionCode		and langCode .. '-' .. regionCode
	or langCode		or langCode
		⚫
	local langName = langData.name		local langName = langData.name
	and linkLang(langData.name, langData.link, args.link)		and linkLang(langData.name, langData.link, args.link)
Line 132:		Line 133:
	if labelCode == '' then		if labelCode == '' then
	label = ''		label = ''
⚫	~~elseif~~ labelCode and data.~~labelCodes~~[labelCode] then
⚫	label = data.~~labelCodes~~[labelCode]:format(~~langName~~)
	else		else
			local langText
⚫	label = data.defaultLabel:format(~~langName~~)
			if langData.text and args.link == 'yes' then
			langText = string.format(
			'[[%s\|%s]]',
			mw.ustring.match(langName, '^%[%[([^\|%]]+)'),
			langData.text
			)
			elseif langData.text then
			langText = langData.text
			else
			langText = mw.ustring.gsub(
			langName,
			'^%[%[(([^\|]+) languages)%]%]$',
			'[[%1\|%2]]'
			)
			langText = mw.ustring.gsub(
			langText,
			' languages(%]?%]?)$',
			'%1'
			)
			end
		⚫	if labelCode and data.labels[labelCode] then
		⚫	label = data.labels[labelCode]:format(langText)
			else
		⚫	label = data.defaultLabel:format(langText)
			end
	end		end
	end		end
Line 156:		Line 180:

	-- Link to key		-- Link to key
	local key = ~~(not args.generic or~~ args.generic ~= 'yes') and langData.key		local key = args.generic ~= 'yes' and langData.key or data.defaultKey
	or data.defaultKey
	s = string.format('[[%s\|%s]]', key, s)		s = string.format('[[%s\|%s]]', key, s)
	else		else

Nardog: small by default for smoother transition

2023-09-16T10:42:51Z

small by default for smoother transition

← Previous revision		Revision as of 10:42, 16 September 2023
Line 142:		Line 142:
	:addClass('IPA-label')		:addClass('IPA-label')
	:wikitext(label)		:wikitext(label)
	if args.small == '~~yes~~' then		if args.small ~= 'no' then
	span:addClass('IPA-label-small')		span:addClass('IPA-label-small')
	table.insert(ret, mw.getCurrentFrame():extensionTag({		table.insert(ret, mw.getCurrentFrame():extensionTag({

TheresNoTime: Protected "Module:IPA": Highly visible template (per use on Template:IPA) ([Edit=Require template editor access] (indefinite) [Move=Require template editor access] (indefinite))

2023-09-15T10:14:45Z

Protected "Module:IPA": Highly visible template (per use on Template:IPA) ([Edit=Require template editor access] (indefinite) [Move=Require template editor access] (indefinite))

← Previous revision	Revision as of 10:14, 15 September 2023
(No difference)