Module:Engvar/sandbox - Revision history

142.113.140.146: fix maint cats breaking piped links in the no engvar autodetected case. copy working code from p.explain

2024-08-20T07:51:04Z

fix maint cats breaking piped links in the no engvar autodetected case. copy working code from p.explain

← Previous revision		Revision as of 07:51, 20 August 2024
Line 34:		Line 34:
	function p._variants(args)		function p._variants(args)
	local returnWord = nil		local returnWord = nil
⚫	~~local auto =~~ ((~~args.~~engvar or '') == 'auto')

	local defaultWord = args.defaultWord or ''		local defaultWord = args.defaultWord or ''
	local engvar = ~~auto and require('Module:Engvar/detect').detect() or~~ args.engvar		local engvar = args.engvar
			local auto = false

		⚫	if (lower(engvar or '') == 'auto') then
			engvar = require('Module:Engvar/detect').detect()
			auto = true
			end

	if engvar == nil then		if engvar == nil then
	-- Nothing to look for; use defaultWord right away		-- Nothing to look for; use defaultWord right away

Ahecht: default to fallback if auto, otherwise default to no fallback

2024-07-24T18:58:45Z

default to fallback if auto, otherwise default to no fallback

← Previous revision		Revision as of 18:58, 24 July 2024
Line 34:		Line 34:
	function p._variants(args)		function p._variants(args)
	local returnWord = nil		local returnWord = nil
			local auto = ((args.engvar or '') == 'auto')

	local defaultWord = args.defaultWord or ''		local defaultWord = args.defaultWord or ''
	local engvar = ~~((args.engvar or '') == '~~auto') and require('Module:Engvar/detect').detect() or args.engvar		local engvar = auto and require('Module:Engvar/detect').detect() or args.engvar

	if engvar == nil then		if engvar == nil then
Line 55:		Line 56:
	elseif args[useLang] then		elseif args[useLang] then
	returnWord = args[useLang]		returnWord = args[useLang]
	elseif yesno(args.fallback, ~~true~~) then		elseif yesno(args.fallback or auto, auto) then --default to fallback if auto, otherwise default to no fallback
	returnWord = fallback(args, useLang)		returnWord = fallback(args, useLang)
	else		else

Ahecht: IUPAC fallback to OED

2024-07-24T18:49:36Z

IUPAC fallback to OED

← Previous revision		Revision as of 18:49, 24 July 2024
Line 6:		Line 6:
	local p = {}		local p = {}
	local getArgs = require('Module:Arguments').getArgs		local getArgs = require('Module:Arguments').getArgs
			local yesno = require('Module:Yesno')
	local gsub = string.gsub		local gsub = string.gsub
	local lower = string.lower		local lower = string.lower
Line 20:		Line 21:
	['en-IN'] = 1, ['en-JM'] = 1, ['en-NZ'] = 1, ['en-PK'] = 1,		['en-IN'] = 1, ['en-JM'] = 1, ['en-NZ'] = 1, ['en-PK'] = 1,
	['en-SCO'] = 1, ['en-SG'] = 1, ['en-ZA'] = 1 }		['en-SCO'] = 1, ['en-SG'] = 1, ['en-ZA'] = 1 }
	if useLang == 'en-OED' and args['en-CA'] then		if (useLang == 'en-IUPAC' or useLang == 'en-OED') and (args['en-OED'] or args['en-CA']) then
	return args['en-CA']		return args['en-OED'] or args['en-CA']
	elseif useLang == 'en-CA' and (args['en-OED'] or args['en-US']) then		elseif useLang == 'en-CA' and (args['en-OED'] or args['en-US']) then
	return args['en-OED'] or args['en-US']		return args['en-OED'] or args['en-US']
Line 54:		Line 55:
	elseif args[useLang] then		elseif args[useLang] then
	returnWord = args[useLang]		returnWord = args[useLang]
	elseif (args.fallback ~~or ''~~) ~~~= ''~~ then		elseif yesno(args.fallback, true) then
	returnWord = fallback(args, useLang)		returnWord = fallback(args, useLang)
	else		else

Ahecht: move fallbacks to separate function

2024-06-06T03:11:50Z

move fallbacks to separate function

@@ Line 13: / Line 13: @@
 	local args = getArgs(frame)
 	return p._variants(args)
 end
@@ Line 39: / Line 55: @@
 			returnWord = args[useLang]
 		elseif (args.fallback or '') ~= '' then
 		else
 			returnWord = defaultWord
@@ Line 71: / Line 74: @@
 	table.insert(ret, 'engvarCat=' .. (args.engvarCat or '[default:yes]') .. '; ')
 	table.insert(ret, 'engvarCatSort=' .. (args.engvarCatSort or ''))
 	table.insert(ret, '\n\n: engvar=' .. engvar .. ' [input] ')
 	if (lower(engvar) == 'auto') then

Ahecht: Add fallback options

2024-06-06T03:05:13Z

Add fallback options

@@ Line 36: / Line 36: @@
 		if useLang == nil then
 			returnWord = defaultWord .. addMaintCat(args)
 		else
-			returnWord = args[useLang] or defaultWord
+			returnWord = defaultWord
 		end
 	end

Ahecht: move comment

2024-06-05T20:52:13Z

move comment

← Previous revision		Revision as of 20:52, 5 June 2024
Line 113:		Line 113:
	searchEngvar = gsub(searchEngvar, '^%sen%-(.)', '%1') -- rm any opening 'en-'.		searchEngvar = gsub(searchEngvar, '^%sen%-(.)', '%1') -- rm any opening 'en-'.
	searchEngvar = gsub(lower(searchEngvar), '[%s%(%)%-]', '') -- To lc, remove all: (, ) , ws, hyphen.		searchEngvar = gsub(lower(searchEngvar), '[%s%(%)%-]', '') -- To lc, remove all: (, ) , ws, hyphen.
⚫	local useLang = langs[searchEngvar]
	--normalize language codes so we don't trigger the maintenence category on valid codes		--normalize language codes so we don't trigger the maintenence category on valid codes
		⚫	local useLang = langs[searchEngvar]
	if useLang then		if useLang then
	return 'en-'..useLang		return 'en-'..useLang

Ahecht: clarify why the alpha-2 codes were added to engvarLang(searchEngvar)

2024-06-05T20:51:33Z

clarify why the alpha-2 codes were added to engvarLang(searchEngvar)

← Previous revision		Revision as of 20:51, 5 June 2024
Line 114:		Line 114:
	searchEngvar = gsub(lower(searchEngvar), '[%s%(%)%-]', '') -- To lc, remove all: (, ) , ws, hyphen.		searchEngvar = gsub(lower(searchEngvar), '[%s%(%)%-]', '') -- To lc, remove all: (, ) , ws, hyphen.
	local useLang = langs[searchEngvar]		local useLang = langs[searchEngvar]
	--normalize language codes		--normalize language codes so we don't trigger the maintenence category on valid codes
	if useLang then		if useLang then
	return 'en-'..useLang		return 'en-'..useLang
Line 170:		Line 170:

	function addMaintCat(args)		function addMaintCat(args)
	local catMaintenance		local catMaintenance
	if args.engvarCat ~= 'no' then		if args.engvarCat ~= 'no' then
	local title = mw.title.getCurrentTitle()		local title = mw.title.getCurrentTitle()

Ahecht: simplify

2024-06-05T20:39:57Z

simplify

← Previous revision		Revision as of 20:39, 5 June 2024
Line 113:		Line 113:
	searchEngvar = gsub(searchEngvar, '^%sen%-(.)', '%1') -- rm any opening 'en-'.		searchEngvar = gsub(searchEngvar, '^%sen%-(.)', '%1') -- rm any opening 'en-'.
	searchEngvar = gsub(lower(searchEngvar), '[%s%(%)%-]', '') -- To lc, remove all: (, ) , ws, hyphen.		searchEngvar = gsub(lower(searchEngvar), '[%s%(%)%-]', '') -- To lc, remove all: (, ) , ws, hyphen.
	local useLang		local useLang = langs[searchEngvar]
	--normalize language codes		--normalize language codes
	if ~~langs[searchEngvar]~~ then		if useLang then
	~~useLang =~~ 'en-'..~~langs[searchEngvar]~~		return 'en-'..useLang
	--Special codes		--Special codes
	elseif match(searchEngvar, 'oxford') then		elseif match(searchEngvar, 'oxford') then
	useLang = '~~en-~~OED' -- 'oxford' to catch before anyting 'british'		useLang = 'OED' -- 'oxford' to catch before anyting 'british'
	elseif match(searchEngvar, 'iupac') then		elseif match(searchEngvar, 'iupac') then
	useLang = '~~en-~~IUPAC' -- chemistry		useLang = 'IUPAC' -- chemistry
	-- Very often used		-- Very often used
	elseif match(searchEngvar, 'british') then		elseif match(searchEngvar, 'british') then
	useLang = '~~en-~~GB'		useLang = 'GB'
	elseif match(searchEngvar, 'unitedstates')		elseif match(searchEngvar, 'unitedstates')
	or match(searchEngvar, 'american') then		or match(searchEngvar, 'american') then
	useLang = '~~en-~~US'		useLang = 'US'
	elseif match(searchEngvar, 'australia') then		elseif match(searchEngvar, 'australia') then
	useLang = '~~en-~~AU'		useLang = 'AU'
	-- Often used		-- Often used
	elseif match(searchEngvar, 'india') then		elseif match(searchEngvar, 'india') then
	useLang = '~~en-~~IN'		useLang = 'IN'
	elseif match(searchEngvar, 'newzealand') then		elseif match(searchEngvar, 'newzealand') then
	useLang = '~~en-~~NZ'		useLang = 'NZ'
	elseif match(searchEngvar, 'southafrica') then -- not: ~~en-~~SA		elseif match(searchEngvar, 'southafrica') then -- not: SA
	useLang = '~~en-~~ZA'		useLang = 'ZA'
	elseif match(searchEngvar, '~~canada~~') then		elseif match(searchEngvar, 'canad') then --'canada' or 'canadian'
	useLang = '~~en-~~CA'		useLang = 'CA'
	elseif match(searchEngvar, 'hiberno')		elseif match(searchEngvar, 'hiberno')
	or match(searchEngvar, 'ireland')		or match(searchEngvar, 'ireland')
	or match(searchEngvar, 'irish') then		or match(searchEngvar, 'irish') then
	useLang = '~~en-~~EI'		useLang = 'EI'
	elseif match(searchEngvar, 'hongkong') then		elseif match(searchEngvar, 'hongkong') then
	useLang = '~~en-~~HK'		useLang = 'HK'
	-- Less often used		-- Less often used
	elseif match(searchEngvar, 'jamaica') then		elseif match(searchEngvar, 'jamaica') then
	useLang = '~~en-~~JM'		useLang = 'JM'
	elseif match(searchEngvar, 'malawi') then		elseif match(searchEngvar, 'malawi') then
	useLang = '~~en-~~MW'		useLang = 'MW'
	elseif match(searchEngvar, 'nigeria') then		elseif match(searchEngvar, 'nigeria') then
	useLang = '~~en-~~NG'		useLang = 'NG'
	elseif match(searchEngvar, 'pakistan') then		elseif match(searchEngvar, 'pakistan') then
	useLang = '~~en-~~PK'		useLang = 'PK'
	elseif match(searchEngvar, 'philippine') then		elseif match(searchEngvar, 'philippine') then
	useLang = '~~en-~~PH'		useLang = 'PH'
	elseif match(searchEngvar, 'scotland')		elseif match(searchEngvar, 'scotland')
	or match(searchEngvar, 'scottish') then		or match(searchEngvar, 'scottish') then
	useLang = '~~en-~~SCO' -- Has no alpha-2 code; not 'scotch'		useLang = 'SCO' -- Has no alpha-2 code; not 'scotch'
	elseif match(searchEngvar, 'singapore') then		elseif match(searchEngvar, 'singapore') then
	useLang = '~~en-~~SG'		useLang = 'SG'
	elseif match(searchEngvar, 'trinidad')		elseif match(searchEngvar, 'trinidad')
	or match(searchEngvar, 'tobago') then		or match(searchEngvar, 'tobago') then
	useLang = '~~en-~~TT'		useLang = 'TT'
	else
	useLang = nil
	end		end

	return useLang		return useLang and 'en-'..useLang
	end		end

Ahecht: simplify cases where we're doing a simple "equals" instead of searching for the string, normalize two letter codes as well

2024-06-05T19:01:37Z

simplify cases where we're doing a simple "equals" instead of searching for the string, normalize two letter codes as well

← Previous revision		Revision as of 19:01, 5 June 2024
Line 91:		Line 91:
	-- Search verbose language identifiers to ISO-format 'en-XX'		-- Search verbose language identifiers to ISO-format 'en-XX'
	-- Assumed: not a blank string '' to search		-- Assumed: not a blank string '' to search
	local match = string.match		local match = string.match
			local langs = {

			us = 'US', usa = 'US',
			au = 'AU', aus = 'AU',
			gb = 'GB', gbr = 'GB', uk = 'GB',
			ca = 'CA', can = 'CA',
			ei = 'EI', irl = 'EI',
			hk = 'HK', hkg = 'HK',
			['in'] = 'IN', ind = 'IN', --'in' is a reserved keyword and needs to be in quotes
			jm = 'JM', jam = 'JM',
			mw = 'MW', mwi = 'MW',
			nz = 'NZ', nzl = 'NZ',
			ng = 'NG', nga = 'NG',
			pk = 'PK', pak = 'PK',
			ph = 'PH', phl = 'PH',
			sco = 'SCO',
			sg = 'SG', sgp = 'SG',
			za = 'ZA', zaf = 'ZA',
			tt = 'TT', tto = 'TT',
			oed = 'OED'};
	searchEngvar = gsub(searchEngvar, '^%sen%-(.)', '%1') -- rm any opening 'en-'.		searchEngvar = gsub(searchEngvar, '^%sen%-(.)', '%1') -- rm any opening 'en-'.
	searchEngvar = gsub(lower(searchEngvar), '[%s%(%)%-]', '') -- To lc, remove all: (, ) , ws, hyphen.		searchEngvar = gsub(lower(searchEngvar), '[%s%(%)%-]', '') -- To lc, remove all: (, ) , ws, hyphen.
	local useLang		local useLang
			--normalize language codes
		⚫	if langs[searchEngvar] then
			useLang = 'en-'..langs[searchEngvar]
	--Special codes		--Special codes
	if match(searchEngvar, 'oxford')		elseif match(searchEngvar, 'oxford') then
⚫	or searchEngvar ~~== 'oed'~~ then
	useLang = 'en-OED' -- 'oxford' to catch before anyting 'british'		useLang = 'en-OED' -- 'oxford' to catch before anyting 'british'
	elseif match(searchEngvar, 'iupac') then		elseif match(searchEngvar, 'iupac') then
	useLang = 'en-IUPAC' -- chemistry		useLang = 'en-IUPAC' -- chemistry
	-- Very often used		-- Very often used
	elseif match(searchEngvar, 'british')		elseif match(searchEngvar, 'british') then
	or searchEngvar == 'uk'
	or searchEngvar == 'gbr' then
	useLang = 'en-GB'		useLang = 'en-GB'
	elseif searchEngvar == 'us'		elseif match(searchEngvar, 'unitedstates')
	or match(searchEngvar, '~~unitedstates~~')		or match(searchEngvar, 'american') then
	or searchEngvar == 'american'
	or searchEngvar == 'usa' then
	useLang = 'en-US'		useLang = 'en-US'
	elseif match(searchEngvar, 'australia')		elseif match(searchEngvar, 'australia') then
	or searchEngvar == 'aus' then
	useLang = 'en-AU'		useLang = 'en-AU'
	-- Often used		-- Often used
	elseif match(searchEngvar, 'india')		elseif match(searchEngvar, 'india') then
	or searchEngvar == 'ind' then
	useLang = 'en-IN'		useLang = 'en-IN'
	elseif searchEngvar == 'newzealand'		elseif match(searchEngvar, 'newzealand') then
	or searchEngvar == 'nzl' then
	useLang = 'en-NZ'		useLang = 'en-NZ'
	elseif match(searchEngvar, 'southafrica') -- not: en-SA		elseif match(searchEngvar, 'southafrica') then -- not: en-SA
	or searchEngvar == 'zaf' then
	useLang = 'en-ZA'		useLang = 'en-ZA'
	elseif searchEngvar == 'canada'		elseif match(searchEngvar, 'canada') then
	or searchEngvar == 'can' then
	useLang = 'en-CA'		useLang = 'en-CA'
	elseif match(searchEngvar, 'hiberno')		elseif match(searchEngvar, 'hiberno')
	or match(searchEngvar, 'ireland')		or match(searchEngvar, 'ireland')
	or match(searchEngvar, 'irish')		or match(searchEngvar, 'irish') then
	or searchEngvar == 'irl' then
	useLang = 'en-EI'		useLang = 'en-EI'
	elseif match(searchEngvar, 'hongkong')		elseif match(searchEngvar, 'hongkong') then
	or searchEngvar == 'hkg' then
	useLang = 'en-HK'		useLang = 'en-HK'
	-- Less often used		-- Less often used
	elseif match(searchEngvar, 'jamaica')		elseif match(searchEngvar, 'jamaica') then
	or searchEngvar == 'jam' then
	useLang = 'en-JM'		useLang = 'en-JM'
	elseif match(searchEngvar, 'malawi')		elseif match(searchEngvar, 'malawi') then
	or searchEngvar == 'mwi' then
	useLang = 'en-MW'		useLang = 'en-MW'
	elseif match(searchEngvar, 'nigeria')		elseif match(searchEngvar, 'nigeria') then
	or searchEngvar == 'nga' then
	useLang = 'en-NG'		useLang = 'en-NG'
	elseif match(searchEngvar, 'pakistan')		elseif match(searchEngvar, 'pakistan') then
	or searchEngvar == 'pak' then
	useLang = 'en-PK'		useLang = 'en-PK'
	elseif match(searchEngvar, 'philippine')		elseif match(searchEngvar, 'philippine') then
	or searchEngvar == 'phl' then
	useLang = 'en-PH'		useLang = 'en-PH'
	elseif match(searchEngvar, 'scotland')		elseif match(searchEngvar, 'scotland')
	or match(searchEngvar, 'scottish')		or match(searchEngvar, 'scottish') then
	or searchEngvar == 'sco' then
	useLang = 'en-SCO' -- Has no alpha-2 code; not 'scotch'		useLang = 'en-SCO' -- Has no alpha-2 code; not 'scotch'
	elseif match(searchEngvar, 'singapore')		elseif match(searchEngvar, 'singapore') then
	or searchEngvar == 'sgp' then
	useLang = 'en-SG'		useLang = 'en-SG'
	elseif match(searchEngvar, 'trinidad')		elseif match(searchEngvar, 'trinidad')
	or match(searchEngvar, 'tobago')		or match(searchEngvar, 'tobago') then
	or searchEngvar == 'tto' then
	useLang = 'en-TT'		useLang = 'en-TT'
	else		else

Ahecht: debug

2024-06-05T18:15:40Z

debug

← Previous revision		Revision as of 18:15, 5 June 2024
Line 56:		Line 56:
	table.insert(ret, '\n\n: engvar=' .. engvar .. ' [input] ')		table.insert(ret, '\n\n: engvar=' .. engvar .. ' [input] ')
	if (lower(engvar) == 'auto') then		if (lower(engvar) == 'auto') then
	~~table.insert(ret,~~ ~~'engvar~~=' ~~.. (~~require('Module:Engvar/detect').detect() or ''~~) .. ' [detected] ')~~		engvar = require('Module:Engvar/detect').detect() or ''
			table.insert(ret, 'engvar=' .. engvar .. ' [detected] ')
	end		end
	local useLang = engvarLang(engvar)		local useLang = engvarLang(engvar)