Module:TNT - Revision history

>Yurik: Apply fix from user:ExE Boss - copying https://www.mediawiki.org/w/index.php?title=Module:TNT/sandbox&oldid=4692817

2021-07-06T16:44:32Z

Apply fix from user:ExE Boss - copying https://www.mediawiki.org/w/index.php?title=Module:TNT/sandbox&oldid=4692817

← Older revision		Revision as of 16:44, 6 July 2021
Line 105:		Line 105:
	local newVal = {}		local newVal = {}
	local name = nil		local name = nil
	for pos, ~~val~~ in ipairs(~~row~~) do		for pos, columnName in ipairs(names) do
	~~local columnName = names[pos]~~
	if columnName == 'name' then		if columnName == 'name' then
	name = ~~val~~		name = row[pos]
	else		else
	newVal[columnName] = ~~val~~		newVal[columnName] = row[pos]
	end		end
	end		end

>Erutuon: insert positional parameters into params in the order of their keys, not the order in which pairs(frame.args) happens to encounter them

2021-06-09T17:31:32Z

insert positional parameters into params in the order of their keys, not the order in which pairs(frame.args) happens to encounter them

← Older revision		Revision as of 17:31, 9 June 2021
Line 50:		Line 50:
	id = mw.text.trim(v)		id = mw.text.trim(v)
	elseif type(k) == 'number' then		elseif type(k) == 'number' then
	~~table.insert(~~params, mw.text.trim(v))		params[k - 2] = mw.text.trim(v)
	elseif k == 'lang' and v ~= '_' then		elseif k == 'lang' and v ~= '_' then
	lang = mw.text.trim(v)		lang = mw.text.trim(v)

>Erutuon: use ipairs to guarantee iteration over integer keys starting at 1 (pairs happens to iterate that way very often, but a case where it does not has been reported on the talk page)

2021-06-09T17:30:32Z

use ipairs to guarantee iteration over integer keys starting at 1 (pairs happens to iterate that way very often, but a case where it does not has been reported on the talk page)

← Older revision		Revision as of 17:30, 9 June 2021
Line 96:		Line 96:
	local data = loadData(dataset)		local data = loadData(dataset)
	local names = {}		local names = {}
	for _, field in ~~pairs~~(data.schema.fields) do		for _, field in ipairs(data.schema.fields) do
	table.insert(names, field.name)		table.insert(names, field.name)
	end		end
Line 102:		Line 102:
	local params = {}		local params = {}
	local paramOrder = {}		local paramOrder = {}
	for _, row in ~~pairs~~(data.data) do		for _, row in ipairs(data.data) do
	local newVal = {}		local newVal = {}
	local name = nil		local name = nil
	for pos, val in ~~pairs~~(row) do		for pos, val in ipairs(row) do
	local columnName = names[pos]		local columnName = names[pos]
	if columnName == 'name' then		if columnName == 'name' then

>Bawolff: Give a more useful error message if jsonconfig is missing. There have been three questions about this on the support desk from third party folks copying this template.

2019-11-27T11:15:52Z

Give a more useful error message if jsonconfig is missing. There have been three questions about this on the support desk from third party folks copying this template.

← Older revision		Revision as of 11:15, 27 November 2019
Line 153:		Line 153:
	if not dataset then		if not dataset then
	error(formatMessage(i18nDataset, 'error_no_dataset', {}))		error(formatMessage(i18nDataset, 'error_no_dataset', {}))
			end

			-- Give helpful error to thirdparties who try and copy this module.
			if not mw.ext or not mw.ext.data or not mw.ext.data.get then
			error('Missing JsonConfig extension; Cannot load https://commons.wikimedia.org/wiki/Data:' .. dataset)
	end		end

>DannyS712: Protected "Module:TNT": Highly visible template ([Edit=Allow only autoconfirmed users] (indefinite) [Move=Allow only administrators] (indefinite))

2019-08-30T05:39:27Z

Protected "Module:TNT": Highly visible template ([Edit=Allow only autoconfirmed users] (indefinite) [Move=Allow only administrators] (indefinite))

← Older revision	Revision as of 05:39, 30 August 2019
(No difference)

>Yurik: breaking: ignore lang param in format(), use formatInLanguage() instead

2019-05-05T22:16:50Z

breaking: ignore lang param in format(), use formatInLanguage() instead

← Older revision		Revision as of 22:16, 5 May 2019
Line 59:		Line 59:

	-- Identical to p.msg() above, but used from other lua modules		-- Identical to p.msg() above, but used from other lua modules
	function p.format(dataset, key, ~~params, lang~~)		-- Parameters: name of dataset, message key, optional arguments
			-- Example with 2 params: format('I18n/Module:TNT', 'error_bad_msgkey', 'my-key', 'my-dataset')
			function p.format(dataset, key, ...)
	local checkType = require('libraryUtil').checkType		local checkType = require('libraryUtil').checkType
	checkType('format', 1, dataset, 'string')		checkType('format', 1, dataset, 'string')
	checkType('format', 2, key, 'string')		checkType('format', 2, key, 'string')
	~~checkType~~('~~format~~', 3, ~~params~~, '~~table~~', ~~true~~)		return formatMessage(dataset, key, {...})
	checkType('~~format~~', 4, lang, 'string', ~~true~~)		end
	return formatMessage(dataset, key, ~~params~~, lang)

			-- Identical to p.msg() above, but used from other lua modules with the language param
			-- Parameters: language code, name of dataset, message key, optional arguments
			-- Example with 2 params: formatInLanguage('es', I18n/Module:TNT', 'error_bad_msgkey', 'my-key', 'my-dataset')
			function p.formatInLanguage(lang, dataset, key, ...)
			local checkType = require('libraryUtil').checkType
			checkType('formatInLanguage', 1, lang, 'string')
			checkType('formatInLanguage', 2, dataset, 'string')
			checkType('formatInLanguage', 3, key, 'string')
			return formatMessage(dataset, key, {...}, lang)
	end		end

>Yurik: optimize libraryUtil loading only when needed

2019-05-02T21:39:56Z

optimize libraryUtil loading only when needed

← Older revision		Revision as of 21:39, 2 May 2019
Line 36:		Line 36:
	local p = {}		local p = {}
	local i18nDataset = 'I18n/Module:TNT.tab'		local i18nDataset = 'I18n/Module:TNT.tab'
	~~local checkType = require('libraryUtil').checkType~~

	-- Forward declaration of the local functions		-- Forward declaration of the local functions
Line 61:		Line 60:
	-- Identical to p.msg() above, but used from other lua modules		-- Identical to p.msg() above, but used from other lua modules
	function p.format(dataset, key, params, lang)		function p.format(dataset, key, params, lang)
			local checkType = require('libraryUtil').checkType
	checkType('format', 1, dataset, 'string')		checkType('format', 1, dataset, 'string')
	checkType('format', 2, key, 'string')		checkType('format', 2, key, 'string')

>Yurik: deprecate link function, always use c: for data links to Commons

2019-05-02T02:03:39Z

deprecate link function, always use c: for data links to Commons

← Older revision		Revision as of 02:03, 2 May 2019
Line 68:		Line 68:
	end		end

	-- ~~Converts~~ first ~~parameter to a interwiki-ready link~~. ~~For example, it converts~~		-- Obsolete function that adds a 'c:' prefix to the first param.
	-- "Sandbox/Sample.tab" -> '~~commons~~:Data:Sandbox/Sample.tab'		-- "Sandbox/Sample.tab" -> 'c:Data:Sandbox/Sample.tab'
	function p.link(frame)		function p.link(frame)
	return link(frame.args[1])		return link(frame.args[1])
Line 158:		Line 158:
	-- Given a dataset name, convert it to a title with the 'commons:data:' prefix		-- Given a dataset name, convert it to a title with the 'commons:data:' prefix
	link = function(dataset)		link = function(dataset)
	~~dataset =~~ 'Data:' .. mw.text.trim(dataset or '')		return 'c:Data:' .. mw.text.trim(dataset or '')
	~~if mw.site.siteName == 'Wikimedia Commons' then~~
	~~return dataset~~
	~~else~~
	~~return 'commons:' .. dataset~~
	~~end~~
	end		end

>Yurik: fix doc translation link

2019-05-01T02:47:54Z

fix doc translation link

← Older revision		Revision as of 02:47, 1 May 2019
Line 39:		Line 39:

	-- Forward declaration of the local functions		-- Forward declaration of the local functions
	local ~~formatMessage~~, loadData, link		local sanitizeDataset, loadData, link, formatMessage

	function p.msg(frame)		function p.msg(frame)
Line 75:		Line 75:

	function p.doc(frame)		function p.doc(frame)
	return frame:extensionTag(		local dataset = 'Templatedata/' .. sanitizeDataset(frame.args[1])
	'templatedata',		return frame:extensionTag('templatedata', p.getTemplateData(dataset)) ..
	p.getTemplateData(~~mw.text.trim(frame.args[1]~~))		formatMessage(i18nDataset, 'edit_doc', {link(dataset)})
	) .. formatMessage(i18nDataset, 'edit_doc', {link(dataset)})
	end		end

	function p.getTemplateData(~~page)~~		function p.getTemplateData(dataset)
	dataset ~~= 'Templatedata/' .. mw.text.trim(page~~)
	-- TODO: add '_' parameter once lua starts reindexing properly for "all" languages		-- TODO: add '_' parameter once lua starts reindexing properly for "all" languages
	local data = loadData(dataset)		local data = loadData(dataset)
Line 124:		Line 122:

	-- Local functions		-- Local functions

			sanitizeDataset = function(dataset)
			if not dataset then
			return nil
			end
			dataset = mw.text.trim(dataset)
			if dataset == '' then
			return nil
			elseif string.sub(dataset,-4) ~= '.tab' then
			return dataset .. '.tab'
			else
			return dataset
			end
			end

	loadData = function(dataset, lang)		loadData = function(dataset, lang)
	if not dataset ~~or dataset == ''~~ then		dataset = sanitizeDataset(dataset)
			if not dataset then
	error(formatMessage(i18nDataset, 'error_no_dataset', {}))		error(formatMessage(i18nDataset, 'error_no_dataset', {}))
	~~end~~
	~~if string.sub(dataset,-4) ~= '.tab' then~~
	~~dataset = dataset .. '.tab'~~
	end		end

>Yurik: no auto I18n/ prefix, breaks some graphs

2019-04-28T05:32:02Z

no auto I18n/ prefix, breaks some graphs

← Older revision		Revision as of 05:32, 28 April 2019
Line 157:		Line 157:

	formatMessage = function(dataset, key, params, lang)		formatMessage = function(dataset, key, params, lang)
	~~-- Message tables must always start with I18n/...~~
	~~if dataset and string.sub(dataset,1,5) ~= 'I18n/' then~~
	~~dataset = 'I18n/' .. dataset~~
	~~end~~
	for _, row in pairs(loadData(dataset, lang).data) do		for _, row in pairs(loadData(dataset, lang).data) do
	local id, msg = unpack(row)		local id, msg = unpack(row)