Kurt at 21:53, 15 September 2024

2024-09-15T21:53:14Z

← Older revision		Revision as of 16:53, 15 September 2024
Line 1:		Line 1:
	-- Original module located at [[:en:Module:Wd]] and [[:en:Module:Wd/i18n]].		-- Original module located at [[:en:Module:Wd]] and [[:en:Module:Wd/i18n]].

	require("strict")		--require("strict")
	local p = {}		local p = {}
	local module_arg = ...		local module_arg = ...

Kurt: 1 revision imported

2024-09-15T21:52:45Z

1 revision imported

← Older revision	Revision as of 16:52, 15 September 2024
(No difference)

en>Janhrach: Update from sandbox – use proper fallback for labels

2024-09-12T18:29:19Z

Update from sandbox – use proper fallback for labels

← Older revision		Revision as of 13:29, 12 September 2024
Line 1:		Line 1:
	-- Original module located at [[:en:Module:Wd]] and [[:en:Module:Wd/i18n]].		-- Original module located at [[:en:Module:Wd]] and [[:en:Module:Wd/i18n]].

	-- require("strict")		require("strict")
	local p = {}		local p = {}
	local module_arg = ...		local module_arg = ...
Line 702:		Line 702:
	-- get label		-- get label
	if not label then		if not label then
	label = mw.wikibase.~~getLabelByLang~~(id~~, self.langCode~~) ~~-- XXX: should use fallback labels?~~		label = mw.wikibase.getLabel(id)
	end		end
	end		end

Kurt at 17:48, 2 September 2024

2024-09-02T17:48:29Z

← Older revision		Revision as of 12:48, 2 September 2024
Line 1:		Line 1:
	-- Original module located at [[:en:Module:Wd]] and [[:en:Module:Wd/i18n]].		-- Original module located at [[:en:Module:Wd]] and [[:en:Module:Wd/i18n]].

	require("strict")		-- require("strict")
	local p = {}		local p = {}
	local module_arg = ...		local module_arg = ...

Kurt: 1 revision imported

2024-09-02T17:12:13Z

1 revision imported

← Older revision	Revision as of 12:12, 2 September 2024
(No difference)

en>Janhrach: citation error message improvement and related internal tweaks

2024-09-02T16:58:49Z

citation error message improvement and related internal tweaks

← Older revision		Revision as of 11:58, 2 September 2024
Line 1:		Line 1:
	-- Original module located at [[:en:Module:Wd]] and [[:en:Module:Wd/i18n]].		-- Original module located at [[:en:Module:Wd]] and [[:en:Module:Wd/i18n]].

	-- require("strict")		require("strict")
	local p = {}		local p = {}
	local ~~arg~~ = ...		local module_arg = ...
	local i18n		local i18n
	local i18nPath		local i18nPath
Line 15:		Line 15:
	else		else
	-- current module included by other module, get its title from ...		-- current module included by other module, get its title from ...
	title = ~~arg~~		title = module_arg
	end		end

Line 165:		Line 165:
	end		end

	local function errorText(code, ~~param~~)		local function errorText(code, ...)
	local text = i18n["errors"][code]		local text = i18n["errors"][code]
	if ~~param~~ then text = mw.ustring.~~gsub~~(text, ~~"$1", param~~) end		if arg then text = mw.ustring.format(text, unpack(arg)) end
	return text		return text
	end		end

	local function throwError(errorMessage, ~~param~~)		local function throwError(errorMessage, ...)
	error(errorText(errorMessage, ~~param~~))		error(errorText(errorMessage, unpack(arg)))
	end		end

Line 1,831:		Line 1,831:
	local referenceEmpty = true -- will be set to false if at least one parameter is left unremoved		local referenceEmpty = true -- will be set to false if at least one parameter is left unremoved

	local version = 10 -- increment this each time the below logic is changed to avoid conflict errors		local version = 11 -- increment this each time the below logic is changed to avoid conflict errors

	if not statement.snaks then		if not statement.snaks then
Line 1,927:		Line 1,927:
	-- handle unknown properties in the reference		-- handle unknown properties in the reference
	if not paramName then		if not paramName then
	citeErrors[citeType] = ~~true~~		local error_message = errorText("unknown-property-in-ref", refProperty)
			assert(error_message) -- Should not be nil
			citeErrors[citeType] = error_message
	break		break
	end		end
Line 1,941:		Line 1,943:
	processedProperty = self:getReferenceDetails(statement.snaks, refProperty, raw, self.linked, true) -- anyLang = true		processedProperty = self:getReferenceDetails(statement.snaks, refProperty, raw, self.linked, true) -- anyLang = true
	else		else
	-- If multiple values are given, all but the first one are discarted.		-- If multiple values are given, all but the first suitable one are discarted.
	processedProperty = {self:getReferenceDetail(statement.snaks, refProperty, raw, self.linked and (statement.snaks[refProperty][1].datatype ~= 'url'), true)} -- link = true/false, anyLang = true		processedProperty = {self:getReferenceDetail(statement.snaks, refProperty, raw, self.linked and (statement.snaks[refProperty][1].datatype ~= 'url'), true)} -- link = true/false, anyLang = true
	end		end
Line 1,972:		Line 1,974:
	-- handle unknown properties in the reference		-- handle unknown properties in the reference
	if not paramName then		if not paramName then
	~~citeErrors[citeType] = true~~		-- Skip this additional property, but do not cause an error.
	break		break
	end		end
Line 2,009:		Line 2,011:
	for _, citeType in ipairs(citeTypes) do		for _, citeType in ipairs(citeTypes) do
	for _, requiredCiteParam in pairs(citeConfig[citeType]["mandatory-params"] or {}) do		for _, requiredCiteParam in pairs(citeConfig[citeType]["mandatory-params"] or {}) do
	if not citeParams[citeType][requiredCiteParam] then		if not citeParams[citeType][requiredCiteParam] then -- The required param is not present.
	citeErrors[citeType] = ~~true~~		if citeErrors[citeType] then -- Do not override the previous error, if it exists.
			break
			end
			local error_message = errorText("missing-mandatory-param", requiredCiteParam)
			assert(error_message) -- Should not be nil
			citeErrors[citeType] = error_message
	end		end
	~~end~~
	~~end~~

	~~-- handle missing templates in the citeConfig~~
	~~for _, citeType in ipairs(citeTypes) do~~
	~~if not citeConfig[citeType]["template"] then~~
	~~citeErrors[citeType] = true~~
	end		end
	end		end
Line 2,037:		Line 2,037:
	local templateToUse = citeConfig[citeTypeToUse]["template"]		local templateToUse = citeConfig[citeTypeToUse]["template"]
	local paramsToUse = citeParams[citeTypeToUse]		local paramsToUse = citeParams[citeTypeToUse]

			if not templateToUse or templateToUse == "" then
			throwError("no-such-reference-template", tostring(templateToUse), i18nPath, citeTypeToUse)
			end

	-- if this module is being substituted then build a regular template call, otherwise expand the template		-- if this module is being substituted then build a regular template call, otherwise expand the template
Line 2,048:		Line 2,052:
	xpcall(		xpcall(
	function () refContent = mw.getCurrentFrame():expandTemplate{title=templateToUse, args=paramsToUse} end,		function () refContent = mw.getCurrentFrame():expandTemplate{title=templateToUse, args=paramsToUse} end,
	function () ~~error~~(~~string.format(i18n["errors"][~~"no-such-reference-template"], templateToUse, i18nPath, citeTypeToUse)) end		function () throwError("no-such-reference-template", templateToUse, i18nPath, citeTypeToUse) end
	)		)
	end		end

	-- If the citation couldn't be displayed using any template, but is not empty (barring ignored propeties), throw an error		-- If the citation couldn't be displayed using any template, but is not empty (barring ignored propeties), throw an error.
	elseif not referenceEmpty then		elseif not referenceEmpty then
	refContent = "~~<span style~~=\"~~color:#dd3333\~~">" .. errorText("malformed-reference") ~~.. "</span>"~~		refContent = errorText("malformed-reference-header")
			for _, citeType in ipairs(citeTypes) do
			refContent = refContent .. errorText("template-failure-reason", citeConfig[citeType]["template"], citeErrors[citeType])
			end
			refContent = refContent .. errorText("malformed-reference-footer")
	end		end

Line 2,064:		Line 2,072:
	if not self.rawValue then		if not self.rawValue then
	-- this should become a <ref> tag, so save the reference's hash for later		-- this should become a <ref> tag, so save the reference's hash for later
	ref.refHash = "wikidata-" .. statement.hash .. "-v" .. (tonumber(i18n~~['cite']~~['version']) + version)		ref.refHash = "wikidata-" .. statement.hash .. "-v" .. (tonumber(i18n['version']) + version)
	end		end
	return {ref}		return {ref}

Kurt at 00:14, 27 August 2024

2024-08-27T00:14:08Z

← Older revision		Revision as of 19:14, 26 August 2024
Line 1:		Line 1:
	-- Original module located at [[:en:Module:Wd]] and [[:en:Module:Wd/i18n]].		-- Original module located at [[:en:Module:Wd]] and [[:en:Module:Wd/i18n]].

	require("strict")		-- require("strict")
	local p = {}		local p = {}
	local arg = ...		local arg = ...

Kurt: 1 revision imported

2024-08-26T23:51:46Z

1 revision imported

← Older revision	Revision as of 18:51, 26 August 2024
(No difference)

en>Janhrach: update from sandbox -- more configurability

2024-08-26T09:41:13Z

update from sandbox -- more configurability

Show changes

Kurt at 00:25, 10 August 2024

2024-08-10T00:25:08Z

← Older revision		Revision as of 19:25, 9 August 2024
Line 1:		Line 1:
	-- Original module located at [[:en:Module:Wd]] and [[:en:Module:Wd/i18n]].		-- Original module located at [[:en:Module:Wd]] and [[:en:Module:Wd/i18n]].

	require("strict")		-- require("strict")
	local p = {}		local p = {}
	local arg = ...		local arg = ...

Module:Wd - Revision history

Kurt at 21:53, 15 September 2024

Kurt: 1 revision imported

en>Janhrach: Update from sandbox – use proper fallback for labels

Kurt at 17:48, 2 September 2024

Kurt: 1 revision imported

en>Janhrach: citation error message improvement and related internal tweaks

Kurt at 00:14, 27 August 2024

Kurt: 1 revision imported

en>Janhrach: update from sandbox -- more configurability

Kurt at 00:25, 10 August 2024