Modul:TNT - Versionsgeschichte

ExE Boss: Update from master using #Synchronizer

2024-03-02T19:13:05Z

← Nächstältere Version		Version vom 2. März 2024, 21:13 Uhr
Zeile 50:		Zeile 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)
Zeile 96:		Zeile 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

			local numOnly = true
	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, 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
	if name then		if name then
			if (
			(type(name) ~= "number")
			and (
			(type(name) ~= "string")
			or not string.match(name, "^%d+$")
			)
			) then
			numOnly = false
			end
	params[name] = newVal		params[name] = newVal
	table.insert(paramOrder, name)		table.insert(paramOrder, name)
Zeile 120:		Zeile 129:

	-- Work around json encoding treating {"1":{...}} as an [{...}]		-- Work around json encoding treating {"1":{...}} as an [{...}]
			if numOnly then
	params['zzz123']=''		params['zzz123']=''
			end

	local json = mw.text.jsonEncode({		local json = mw.text.jsonEncode({
	params=params,		params=params,
	paramOrder=paramOrder,		paramOrder=paramOrder,
	description=data.description		description=data.description,
	})		})

			if numOnly then
	json = string.gsub(json,'"zzz123":"",?', "")		json = string.gsub(json,'"zzz123":"",?', "")
			end

	return json		return json
Zeile 157:		Zeile 170:
	-- Give helpful error to thirdparties who try and copy this module.		-- 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		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)~~		error(string.format([['''Missing JsonConfig extension, or not properly configured;
			Cannot load https://commons.wikimedia.org/wiki/Data:%s.
			See https://www.mediawiki.org/wiki/Extension:JsonConfig#Supporting_Wikimedia_templates''']], dataset))
	end		end

Yurik: Copying one change by 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." from mw:Module:TNT. (docs, translate)

2020-08-12T22:21:57Z

Copying one change by 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." from mw:Module:TNT. (docs, translate)

← Nächstältere Version		Version vom 13. August 2020, 00:21 Uhr
Zeile 153:		Zeile 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

Yurik: update manually from mw

2019-05-06T03:48:40Z

update manually from mw

@@ Zeile 59: / Zeile 59: @@
 -- 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
 	local checkType = require('libraryUtil').checkType
 	checkType('format', 1, dataset, 'string')
 	checkType('format', 2, key, 'string')
 end

DiBabelYurikBot: Copying 4 changes by Yurik: "optimize libraryUtil loading only when needed, fix templatedata doc having just the positional parameters, make i18n/ prefix optional, support for usage from modules, no auto I18n/ prefix, breaks some graphs" from mw:Module:TNT. (docs, translate)

2019-05-04T03:34:37Z

Copying 4 changes by Yurik: "optimize libraryUtil loading only when needed, fix templatedata doc having just the positional parameters, make i18n/ prefix optional, support for usage from modules, no auto I18n/ prefix, breaks some graphs" from mw:Module:TNT. (docs, translate)

← Nächstältere Version		Version vom 4. Mai 2019, 05:34 Uhr
Zeile 36:		Zeile 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
Zeile 61:		Zeile 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')
Zeile 68:		Zeile 68:
	end		end

			-- Obsolete function that adds a 'c:' prefix to the first param.
	-- Converts first parameter to a interwiki-ready link. For example, it converts
	-- "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])
Zeile 158:		Zeile 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

DiBabelYurikBot: Copying 5 changes by Yurik: "fix doc translation link, Trim parameter whitespaces, docs link, fix templatedata doc having just the positional parameters, make i18n/ prefix optional, support for usage from modules" from mw:Module:TNT. (docs, translate)

2019-05-01T03:05:54Z

Copying 5 changes by Yurik: "fix doc translation link, Trim parameter whitespaces, docs link, fix templatedata doc having just the positional parameters, make i18n/ prefix optional, support for usage from modules" from mw:Module:TNT. (docs, translate)

← Nächstältere Version		Version vom 1. Mai 2019, 05:05 Uhr
Zeile 39:		Zeile 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)
Zeile 75:		Zeile 75:

	function p.doc(frame)		function p.doc(frame)
		⚫	local dataset = 'Templatedata/' .. sanitizeDataset(frame.args[1])
	return frame:extensionTag(
	'templatedata',		return frame:extensionTag('templatedata', p.getTemplateData(dataset)) ..
		⚫	formatMessage(i18nDataset, 'edit_doc', {link(dataset)})
	p.getTemplateData(mw.text.trim(frame.args[1]))
⚫	) .. 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)
Zeile 124:		Zeile 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

DiBabelYurikBot: Copying 4 changes by Yurik: "no auto I18n/ prefix, breaks some graphs, fixed doc link, Trim parameter whitespaces, docs link" from mw:Module:TNT. See docs.

2019-04-28T05:44:24Z

Copying 4 changes by Yurik: "no auto I18n/ prefix, breaks some graphs, fixed doc link, Trim parameter whitespaces, docs link" from mw:Module:TNT. See docs.

Änderungen zeigen

DiBabelYurikBot: Copying 5 changes by Yurik: "fix templatedata doc having just the positional parameters, better description, more docs changes, fixed doc link, Trim parameter whitespaces" from mw:Module:TNT. See docs.

2019-04-25T17:44:45Z

Copying 5 changes by Yurik: "fix templatedata doc having just the positional parameters, better description, more docs changes, fixed doc link, Trim parameter whitespaces" from mw:Module:TNT. See docs.

← Nächstältere Version		Version vom 25. April 2019, 19:44 Uhr
Zeile 72:		Zeile 72:

	function p.doc(frame)		function p.doc(frame)
			return frame:extensionTag(
⚫	dataset = 'Templatedata/' .. normalizeDataset(~~frame.args[1]~~)
			'templatedata',
			p.getTemplateData(frame.args[1])
		⚫	) .. tntMessage('edit_doc', {link(dataset)})
			end

			function p.getTemplateData(page)
		⚫	dataset = 'Templatedata/' .. normalizeDataset(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)
Zeile 98:		Zeile 105:
	end		end
	end		end

			-- Work around json encoding treating {"1":{...}} as an [{...}]
			params['zzz123']=''

	local ~~templateData~~ = {		local json = mw.text.jsonEncode({
	params=params,		params=params,
	paramOrder=paramOrder,		paramOrder=paramOrder,
	description=data.description		description=data.description
	}		})


			json = string.gsub(json,'"zzz123":"",?', "")
	templateData = mw.text.jsonEncode(templateData)

			return json
⚫	~~return frame:extensionTag('templatedata', templateData~~) .. tntMessage('edit_doc', {link(dataset)})
	end		end

Yurik: resetting to the main mediawiki.org version. Will leave a msg about , frame.args.lang

2019-04-12T02:57:04Z

resetting to the main mediawiki.org version. Will leave a msg about , frame.args.lang

← Nächstältere Version		Version vom 12. April 2019, 04:57 Uhr
Zeile 4:		Zeile 4:
	-- wikis without any translation changes. All translation text is stored		-- wikis without any translation changes. All translation text is stored
	-- in the global Data:*.tab pages on Commons, and used everywhere.		-- in the global Data:*.tab pages on Commons, and used everywhere.
			--
			-- SEE: https://www.mediawiki.org/wiki/Multilingual_Templates_and_Modules
	--		--
	-- ATTENTION:		-- ATTENTION:
Zeile 18:		Zeile 20:
	--		--
	-- {{#invoke:TNT \| msg		-- {{#invoke:TNT \| msg
	-- \| ~~Original~~/Template:Graphs.tab <!-- https://commons.wikimedia.org/wiki/Data:~~Original~~/Template:Graphs.tab -->		-- \| I18n/Template:Graphs.tab <!-- https://commons.wikimedia.org/wiki/Data:I18n/Template:Graphs.tab -->
	-- \| source-table <!-- uses a translation message with id = "source-table" -->		-- \| source-table <!-- uses a translation message with id = "source-table" -->
	-- \| param1 }} <!-- optional parameter -->		-- \| param1 }} <!-- optional parameter -->
	--		--
	--		--
Zeile 41:		Zeile 43:
	for k, v in pairs(frame.args) do		for k, v in pairs(frame.args) do
	if k == 1 then		if k == 1 then
	dataset = v		dataset = mw.text.trim(v)
	elseif k == 2 then		elseif k == 2 then
	id = v		id = mw.text.trim(v)
	elseif type(k) == 'number' then		elseif type(k) == 'number' then
	table.insert(params, v)		table.insert(params, v)
	elseif k == 'lang' and v ~= '_' then		elseif k == 'lang' and v ~= '_' then
	lang = v		lang = mw.text.trim(v)
	end		end
	end		end
Zeile 61:		Zeile 63:
	-- 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
	function link(dataset)		function link(dataset)
	dataset = 'Data:' .. (dataset or '')		dataset = 'Data:' .. mw.text.trim(dataset or '')
	if mw.site.siteName == 'Wikimedia Commons' then		if mw.site.siteName == 'Wikimedia Commons' then
	return dataset		return dataset
Zeile 72:		Zeile 74:
	dataset = 'Templatedata/' .. normalizeDataset(frame.args[1])		dataset = 'Templatedata/' .. normalizeDataset(frame.args[1])
	-- 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~~, frame.args.lang~~)		local data = loadData(dataset)
	local names = {}		local names = {}
	for _, field in pairs(data.schema.fields) do		for _, field in pairs(data.schema.fields) do

Mps am 1. Mai 2018 um 18:40 Uhr

2018-05-01T18:40:59Z

← Nächstältere Version		Version vom 1. Mai 2018, 20:40 Uhr
Zeile 72:		Zeile 72:
	dataset = 'Templatedata/' .. normalizeDataset(frame.args[1])		dataset = 'Templatedata/' .. normalizeDataset(frame.args[1])
	-- 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, frame.args.lang)
	local names = {}		local names = {}
	for _, field in pairs(data.schema.fields) do		for _, field in pairs(data.schema.fields) do

Mps: AZ: Die Seite wurde neu angelegt: -- -- INTRO: (!!! DO NOT RENAME THIS PAGE !!!) -- This module allows any template or module to be…

2018-04-14T12:47:43Z

AZ: Die Seite wurde neu angelegt: -- -- INTRO: (!!! DO NOT RENAME THIS PAGE !!!) -- This module allows any template or module to be…

Neue Seite

--
-- INTRO: (!!! DO NOT RENAME THIS PAGE !!!)
-- This module allows any template or module to be copy/pasted between
-- wikis without any translation changes. All translation text is stored
-- in the global Data:*.tab pages on Commons, and used everywhere.
--
-- ATTENTION:
-- Please do NOT rename this module - it has to be identical on all wikis.
-- This code is maintained at https://www.mediawiki.org/wiki/Module:TNT
-- Please do not modify it anywhere else, as it may get copied and override your changes.
-- Suggestions can be made at https://www.mediawiki.org/wiki/Module_talk:TNT
--
-- DESCRIPTION:
-- The "msg" function uses a Commons dataset to translate a message
-- with a given key (e.g. source-table), plus optional arguments
-- to the wiki markup in the current content language.
-- Use lang=xx to set language. Example:
--
-- {{#invoke:TNT | msg
-- | Original/Template:Graphs.tab 
-- | source-table 
-- | param1 }} 
--
--
-- The "doc" function will generate the <templatedata> parameter documentation for templates.
-- This way all template parameters can be stored and localized in a single Commons dataset.
-- NOTE: "doc" assumes that all documentation is located in Data:Templatedata/* on Commons.
--
-- {{#invoke:TNT | doc | Graph:Lines }}
-- uses https://commons.wikimedia.org/wiki/Data:Templatedata/Graph:Lines.tab
-- if the current page is Template:Graph:Lines/doc
--

local p = {}
local i18nDataset = 'I18n/Module:TNT.tab'

function p.msg(frame)
local dataset, id
local params = {}
local lang = nil
for k, v in pairs(frame.args) do
if k == 1 then
dataset = v
elseif k == 2 then
id = v
elseif type(k) == 'number' then
table.insert(params, v)
elseif k == 'lang' and v ~= '_' then
lang = v
end
end
return formatMessage(dataset, id, params, lang)
end

-- Converts first parameter to a interwiki-ready link. For example, it converts
-- "Sandbox/Sample.tab" -> 'commons:Data:Sandbox/Sample.tab'
function p.link(frame)
return link(frame.args[1])
end

-- Given a dataset name, convert it to a title with the 'commons:data:' prefix
function link(dataset)
dataset = 'Data:' .. (dataset or '')
if mw.site.siteName == 'Wikimedia Commons' then
return dataset
else
return 'commons:' .. dataset
end
end

function p.doc(frame)
dataset = 'Templatedata/' .. normalizeDataset(frame.args[1])
-- TODO: add '_' parameter once lua starts reindexing properly for "all" languages
local data = loadData(dataset)
local names = {}
for _, field in pairs(data.schema.fields) do
table.insert(names, field.name)
end

local params = {}
local paramOrder = {}
for _, row in pairs(data.data) do
local newVal = {}
local name = nil
for pos, val in pairs(row) do
local columnName = names[pos]
if columnName == 'name' then
name = val
else
newVal[columnName] = val
end
end
if name then
params[name] = newVal
table.insert(paramOrder, name)
end
end

local templateData = {
params=params,
paramOrder=paramOrder,
description=data.description
}

templateData = mw.text.jsonEncode(templateData)

return frame:extensionTag('templatedata', templateData) .. tntMessage('edit_doc', {link(dataset)})
end

function formatMessage(dataset, key, params, lang)
for _, row in pairs(loadData(dataset, lang).data) do
local id, msg = unpack(row)
if id == key then
local result = mw.message.newRawMessage(msg, unpack(params))
return result:plain()
end
end
if dataset == i18nDataset then
-- Prevent cyclical calls
error('Invalid message key "' .. key .. '"')
else
error(tntMessage('error_bad_msgkey', {key, link(dataset)}))
end
end

function tntMessage(key, params)
return formatMessage(i18nDataset, key, params)
end

function normalizeDataset(dataset)
if not dataset or dataset == '' then
error(tntMessage('error_no_dataset', {}))
end
if string.sub(dataset,-4) ~= '.tab' then
dataset = dataset .. '.tab'
end
return dataset
end

function loadData(dataset, lang)
local data = mw.ext.data.get(dataset, lang)
if data == false then
if dataset == i18nDataset then
-- Prevent cyclical calls
error('Missing Commons dataset ' .. i18nDataset)
else
error(tntMessage('error_bad_dataset', {link(dataset)}))
end
end
return data
end

return p