Module:Wikidata table - Revision history

MSGJ: remove unused function and use ucfirst for short description

2024-08-21T18:19:56Z

remove unused function and use ucfirst for short description

← Previous revision		Revision as of 18:19, 21 August 2024
Line 9:		Line 9:
	-- Internationalisation		-- Internationalisation

		⚫	local currentlang = mw.language.getContentLanguage()
	-- takes optional string language code (e.g. "en") and returns a language object
	local findLang = function(langcode)
	local langobj
	langcode = mw.text.trim(langcode or "")
	if mw.language.isKnownLanguageTag(langcode) then
	langobj = mw.language.new( langcode )
⚫	else
	langcode = mw.getCurrentFrame():callParserFunction('int', {'lang'})
	if mw.language.isKnownLanguageTag(langcode) then
	langobj = mw.language.new( langcode )
	else
⚫	~~langobj~~ = mw.language.getContentLanguage()
	end
	end
	return langobj
	end
	local currentlang = findLang().code

	local i18n = {		local i18n = {
Line 491:		Line 475:
	elseif val=='SD' then		elseif val=='SD' then
	local short_description = mw.wikibase.getDescription(qid)		local short_description = mw.wikibase.getDescription(qid)
	if ~~not~~ short_description then		if short_description then
			short_description = currentlang:ucfirst(short_description)
⚫	local getShortDescription = require( 'Module:GetShortDescription' ).main
		⚫	else
		⚫	local getShortDescription = require('Module:GetShortDescription' ).main
	local sdt = getShortDescription{name = mw.wikibase.sitelink(qid)}		local sdt = getShortDescription{name = mw.wikibase.sitelink(qid)}
	short_description = sdt.explicit or ''		short_description = sdt.explicit or ''
Line 691:		Line 677:
	out = out .. "</tr></table>"		out = out .. "</tr></table>"
	if qid then		if qid then
	local langobj = mw.language.new("en")
	out = out .. "<h3>Example</h3>The Wikidata QID for "		out = out .. "<h3>Example</h3>The Wikidata QID for "
	local sitelink = mw.wikibase.getSitelink(qid)		local sitelink = mw.wikibase.getSitelink(qid)
Line 709:		Line 694:
	proplabel = 'Short description'		proplabel = 'Short description'
	else		else
	proplabel = ~~langobj~~:ucfirst(mw.wikibase.getLabel(pidtable[c][1].property)) .. unit(pidtable[c][1].unit)		proplabel = currentlang:ucfirst(mw.wikibase.getLabel(pidtable[c][1].property)) .. unit(pidtable[c][1].unit)
	end		end
	out = out .. "<th>" .. proplabel .. "</th>"		out = out .. "<th>" .. proplabel .. "</th>"

MSGJ: use wikidata description if one is defined

2024-08-21T17:37:52Z

use wikidata description if one is defined

← Previous revision		Revision as of 17:37, 21 August 2024
Line 490:		Line 490:
	out = out .. "<td></td>"		out = out .. "<td></td>"
	elseif val=='SD' then		elseif val=='SD' then
			local short_description = mw.wikibase.getDescription(qid)
⚫	local getShortDescription = require( 'Module:GetShortDescription' ).main
	~~local~~ short_description ~~= getShortDescription{name = mw.wikibase.sitelink(qid)}.explicit or ''~~		if not short_description then
		⚫	local getShortDescription = require( 'Module:GetShortDescription' ).main
			local sdt = getShortDescription{name = mw.wikibase.sitelink(qid)}
			short_description = sdt.explicit or ''
			end
	out = out .. '<td style="text-align:center;">' .. short_description .. '</td>'		out = out .. '<td style="text-align:center;">' .. short_description .. '</td>'
	else		else

MSGJ: remove unused functions and add support for short description

2024-08-21T13:58:32Z

remove unused functions and add support for short description

@@ Line 434: / Line 434: @@
 	if quals == "" then quals = nil end
 	return p._getWD(qid, pid, maxvals, quals)
 end
@@ Line 545: / Line 489: @@
 		elseif not qid then
 			out = out .. "<td></td>"
 		else
 			-- separate multiple properties in same cell, sep=+
@@ Line 683: / Line 631: @@
 			pidtable[c1][c2].property = mw.text.split(propandquals, "/")[1]
 			pidtable[c1][c2].unit = pidtable[c1][c2].property:match("%((Q%d+)%)")
-			pidtable[c1][c2].property = pidtable[c1][c2].property:match("P%d+")
+			if pidtable[c1][c2].property~='SD' then
 			local quals = mw.text.split(propandquals, "/")[2]
 			if quals then
@@ Line 720: / Line 670: @@
 		out = out .. "<td>"
 		for c2 = 1,#pidtable[c1] do
-			out = out .. proplink(pidtable[c1][c2].property) .. unit(pidtable[c1][c2].unit)
+			if pidtable[c1][c2].property=='SD' then
-				for c3 = 1,#pidtable[c1][c2].quals do
+				out = out .. proplink(pidtable[c1][c2].property) .. unit(pidtable[c1][c2].unit)
-					out = out .. proplink(pidtable[c1][c2].quals[c3])
+				if pidtable[c1][c2].quals then
 				end
 			end
@@ Line 748: / Line 702: @@
 			if pidtable[c][1].property == "P1" then
 				proplabel = "Column " .. c+1
 			else
 				proplabel = langobj:ucfirst(mw.wikibase.getLabel(pidtable[c][1].property)) .. unit(pidtable[c][1].unit)
@@ Line 791: / Line 747: @@
 		if pidtable[c][1].property == "P1" then
 			td = td .. ',"c' .. c+1 .. '": {"label": "Define column ' .. c+1 .. '","description": "Define column ' .. c+1 .. ' with this content","type": "content"}'
 			local label = mw.wikibase.getLabel(pidtable[c][1].property)
 			td = td .. ',"c' .. c+1 .. '": {"label": "Override ' .. label .. '","description": "Override the ' .. label .. ' (column ' .. c+1 .. ') with this content","type": "content"}'

MSGJ: replace \n with

2024-08-15T22:44:37Z

replace \n with <br>

← Previous revision		Revision as of 22:44, 15 August 2024
Line 741:		Line 741:
	out = out .. mw.wikibase.getLabel(qid)		out = out .. mw.wikibase.getLabel(qid)
	end		end
	out = out .. " is [[:d:Special:EntityPage/" .. qid .. "\|" .. qid .. "]]. Typing the following:\n"		out = out .. " is [[:d:Special:EntityPage/" .. qid .. "\|" .. qid .. "]]. Typing the following:<br>"
	out = out .. "<code>{{" .. mw.title.getCurrentTitle().text .. "\|qid=" .. qid .. "}}</code>\n produces"		out = out .. "<code>{{" .. mw.title.getCurrentTitle().text .. "\|qid=" .. qid .. "}}</code><br>produces"
	out = out .. '<table class="wikitable"><tr><th>Name</th>'		out = out .. '<table class="wikitable"><tr><th>Name</th>'
	for c = 1,#pidtable do		for c = 1,#pidtable do

MSGJ: better explanation of converted unit

2024-08-15T19:34:40Z

better explanation of converted unit

← Previous revision		Revision as of 19:34, 15 August 2024
Line 343:		Line 343:
	if unitsymbol[unit] then		if unitsymbol[unit] then
	if colunit then -- attempt to convert to default unit		if colunit then -- attempt to convert to default unit
			local unit_label = mw.wikibase.label(unit) or unitsymbol[unit] or '???'
			local colunit_label = mw.wikibase.label(colunit) or unitsymbol[colunit] or '???'
	retval = mw.getCurrentFrame():expandTemplate{ title = "cvt", args = {		retval = mw.getCurrentFrame():expandTemplate{ title = "cvt", args = {
	amount,		amount,
Line 352:		Line 354:
	args = {		args = {
	name = string.format(		name = string.format(
	'Converted%~~sinto~~%s',		'Converted%s%s',
	unitsymbol[unit],		unitsymbol[unit],
	unitsymbol[colunit]		unitsymbol[colunit]
	),		),
	[1] = string.format(		[1] = string.format(
	'~~Value~~ ~~calculated~~ by ~~automatically~~ ~~converting~~ %s ~~from~~ ~~source~~ ~~into~~ %s for uniformity.',		'Change in units: quantity in %s has been automatically converted to %s for uniformity.',
	~~unitsymbol[unit]~~,		unit_label,
	~~unitsymbol[colunit]~~		colunit_label
	)		)
	}		}

MSGJ: improve note when units are automatically converted

2024-08-15T08:46:43Z

improve note when units are automatically converted

← Previous revision		Revision as of 08:46, 15 August 2024
Line 350:		Line 350:
	} .. mw.getCurrentFrame():expandTemplate{		} .. mw.getCurrentFrame():expandTemplate{
	title="efn",		title="efn",
	args = {string.format(		args = {
			name = string.format(
	'~~Value calculated by converting~~ %~~s %s into~~ %s.',		'Converted%sinto%s',
	~~amount~~,		unitsymbol[unit],
	unitsymbol[~~unit~~],		unitsymbol[colunit]
	~~unitsymbol[colunit]~~		),
	)}		[1] = string.format(
			'Value calculated by automatically converting %s from source into %s for uniformity.',
			unitsymbol[unit],
			unitsymbol[colunit]
			)
			}
	}		}
	else -- show unit and default conversion		else -- show unit and default conversion

MSGJ: tidy code, add space

2024-08-10T22:11:50Z

tidy code, add space

← Previous revision		Revision as of 22:11, 10 August 2024
Line 343:		Line 343:
	if unitsymbol[unit] then		if unitsymbol[unit] then
	if colunit then -- attempt to convert to default unit		if colunit then -- attempt to convert to default unit
	retval = mw.getCurrentFrame():expandTemplate{ title = "cvt", args = {amount, unitsymbol[unit], unitsymbol[colunit], disp='number'} }		retval = mw.getCurrentFrame():expandTemplate{ title = "cvt", args = {
			amount,
			unitsymbol[unit],
			unitsymbol[colunit],
			disp='number'}
	.. mw.getCurrentFrame():expandTemplate{~~title="efn", args = {'Value calculated by converting '..amount..unitsymbol[unit]..' into '..unitsymbol[colunit]..'.'}}~~		} .. mw.getCurrentFrame():expandTemplate{
			title="efn",
			args = {string.format(
			'Value calculated by converting %s %s into %s.',
			amount,
			unitsymbol[unit],
			unitsymbol[colunit]
			)}
			}
	else -- show unit and default conversion		else -- show unit and default conversion
	retval = mw.getCurrentFrame():expandTemplate{ title = "cvt", args = {amount, unitsymbol[unit]} }		retval = mw.getCurrentFrame():expandTemplate{ title = "cvt", args = {amount, unitsymbol[unit]} }

MSGJ: +km2

2024-08-10T22:01:06Z

+km2

← Previous revision		Revision as of 22:01, 10 August 2024
Line 78:		Line 78:
	Q828224 = "km",		Q828224 = "km",
	Q81292 = "acres",		Q81292 = "acres",
	Q35852 = "ha"		Q35852 = "ha",
			Q712226 = "km2"
	}		}

MSGJ: +Lighthouse Directory formatter

2023-05-24T14:58:53Z

+Lighthouse Directory formatter

← Previous revision		Revision as of 14:58, 24 May 2023
Line 92:		Line 92:
	P613 = "http://nearby.org.uk/coord.cgi?p=$1", -- OS grid reference		P613 = "http://nearby.org.uk/coord.cgi?p=$1", -- OS grid reference
	P373 = "https://commons.wikimedia.org/wiki/Category:$1", -- Commons category		P373 = "https://commons.wikimedia.org/wiki/Category:$1", -- Commons category
	P11235 = "http://damnet.or.jp/cgi-bin/binranA/enAll.cgi?db4=$1" -- Dams in Japan		P11235 = "http://damnet.or.jp/cgi-bin/binranA/enAll.cgi?db4=$1", -- Dams in Japan
			P11627 = "https://www.ibiblio.org/lighthouse/$1.htm", -- Lighthouse Directory
	}		}

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

2023-02-16T05:39:52Z

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

← Previous revision		Revision as of 05:39, 16 February 2023
Line 16:		Line 16:
	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 )