Module:Complex date - Revision history

RexxS: update from sandbox (commons version)

2020-05-15T19:21:05Z

update from sandbox (commons version)

Johnuniq: fix one more global problem; couple of minor cleanups; this fixes errors in a few articles such as Alexey Verstovsky

2020-05-15T03:56:09Z

fix one more global problem; couple of minor cleanups; this fixes errors in a few articles such as Alexey Verstovsky

← Previous revision		Revision as of 03:56, 15 May 2020
Line 212:		Line 212:
	end		end
	elseif str2 and str2~='' then -- if "str1" of type "sType" is empty than maybe ...		elseif str2 and str2~='' then -- if "str1" of type "sType" is empty than maybe ...
	a = i18n.Synonyms[str2] -- ..."str2" is of the same type and is not empty		local a = i18n.Synonyms[str2] -- ..."str2" is of the same type and is not empty
	if a and a[2]==sType then		if a and a[2]==sType then
	out = a[1]		out = a[1]
Line 225:		Line 225:
	-- "precision" is wikibase compatible date precision number: 6=millennium, 7=century, 8=decade, 9=year, 10=month, 11=day		-- "precision" is wikibase compatible date precision number: 6=millennium, 7=century, 8=decade, 9=year, 10=month, 11=day
	-- based on string or numeric input calculate "Units" and "precision"		-- based on string or numeric input calculate "Units" and "precision"
	local dateNum = tonumber(dateStr)		local dateNum = tonumber(dateStr) -- TODO dateNum is not used: should remove?
	local precision		local precision
	if type(units)=='number' then		if type(units)=='number' then
Line 382:		Line 382:
	function p.Era(frame)		function p.Era(frame)
	-- process inputs		-- process inputs
	local dateStr
	local args = frame.args		local args = frame.args
	if not (args.lang and mw.language.isSupportedLanguage(args.lang)) then		if not (args.lang and mw.language.isSupportedLanguage(args.lang)) then
Line 505:		Line 504:
	function p.complex_date(frame)		function p.complex_date(frame)
	-- process inputs		-- process inputs
	local dateStr~~, Error~~		local dateStr
	local args = frame.args		local args = frame.args
	if not (args.lang and mw.language.isSupportedLanguage(args.lang)) then		if not (args.lang and mw.language.isSupportedLanguage(args.lang)) then

Johnuniq: clean whitespace

2020-05-15T03:54:48Z

clean whitespace

Show changes

RexxS: no globals - change to local

2020-05-14T21:02:23Z

no globals - change to local

← Previous revision		Revision as of 21:02, 14 May 2020
Line 205:		Line 205:
	local out = ''		local out = ''
	if str1 and str1~='' then		if str1 and str1~='' then
	a = i18n.Synonyms[str1] -- look up synonyms of "str1"		local a = i18n.Synonyms[str1] -- look up synonyms of "str1"
	if a then		if a then
	out = a[1]		out = a[1]
Line 225:		Line 225:
	-- "precision" is wikibase compatible date precision number: 6=millennium, 7=century, 8=decade, 9=year, 10=month, 11=day		-- "precision" is wikibase compatible date precision number: 6=millennium, 7=century, 8=decade, 9=year, 10=month, 11=day
	-- based on string or numeric input calculate "Units" and "precision"		-- based on string or numeric input calculate "Units" and "precision"
	local dateNum = tonumber(dateStr);		local dateNum = tonumber(dateStr)
			local precision
	if type(units)=='number' then		if type(units)=='number' then
	precision = units		precision = units
Line 266:		Line 267:
	return nil		return nil
	elseif era ~= '' then		elseif era ~= '' then
	eraLUT = {ad='+', bc='-', bp='-' }		local eraLUT = {ad='+', bc='-', bp='-' }
	era = eraLUT[era]		era = eraLUT[era]
	else		else

RexxS: dt should be local {fix from Commons}

2019-02-26T23:40:28Z

dt should be local {fix from Commons}

← Previous revision		Revision as of 23:40, 26 February 2019
Line 175:		Line 175:
	dateStr = translatePhrase(date1, date2, operation, lang, state)		dateStr = translatePhrase(date1, date2, operation, lang, state)
	dateStr = mw.ustring.gsub(mw.ustring.gsub(dateStr, '%( ', '('), ' %)', ')') -- in case date2 is empty		dateStr = mw.ustring.gsub(mw.ustring.gsub(dateStr, '%( ', '('), ' %)', ')') -- in case date2 is empty
	elseif operation == 'turn of the year' or operation == 'turn of the decade' or operation == 'turn of the century' then		elseif operation == 'turn of the year' or operation == 'turn of the decade' or operation == 'turn of the century' then
	if operation == 'turn of the decade' then dt=10 ~~else dt=1~~ end		local dt = 1
			if operation == 'turn of the decade' then dt=10 end
	if not date2 or date2=='' then date2=tostring(tonumber(date1)-dt) end		if not date2 or date2=='' then date2=tostring(tonumber(date1)-dt) end
	if era~='bp' and era~='bc' then date1, date2 = date2, date1 end		if era~='bp' and era~='bc' then date1, date2 = date2, date1 end

Pppery: Lazy load Module:Calendar, not actually needed by this module in the way it is used through Module:WikidataIB

2019-02-21T18:49:00Z

Lazy load Module:Calendar, not actually needed by this module in the way it is used through Module:WikidataIB

← Previous revision		Revision as of 18:49, 21 February 2019
Line 22:		Line 22:
	local i18n = require('Module:i18n/complex date')		local i18n = require('Module:i18n/complex date')
	local ISOdate = require('Module:ISOdate')._ISOdate		local ISOdate = require('Module:ISOdate')._ISOdate
	local Calendar ~~= require('Module:Calendar')~~		local Calendar -- loaded lazily

	-- ==================================================		-- ==================================================
Line 162:		Line 162:
	elseif operation == 'julian' then		elseif operation == 'julian' then
	if not date2 and date1 then -- Convert from Julian to Gregorian calendar date		if not date2 and date1 then -- Convert from Julian to Gregorian calendar date
			if Calendar == nil then
			Calendar = require("Module:Calendar")
			end
	local JDN = Calendar._date2jdn(date1, 0)		local JDN = Calendar._date2jdn(date1, 0)
	if JDN then		if JDN then

Ferret: Protected "Module:Complex date": Highly visible template ([Edit=Require template editor access] (indefinite) [Move=Require template editor access] (indefinite))

2019-01-24T00:48:49Z

Protected "Module:Complex date": Highly visible template ([Edit=Require template editor access] (indefinite) [Move=Require template editor access] (indefinite))

← Previous revision	Revision as of 00:48, 24 January 2019
(No difference)

Ferret: Undid revision 879882658 by 153.185.54.127 (talk) Broken every infobox relying on this module.

2019-01-24T00:48:36Z

Undid revision 879882658 by 153.185.54.127 (talk) Broken every infobox relying on this module.

← Previous revision		Revision as of 00:48, 24 January 2019
Line 31:		Line 31:
	local langList = mw.language.getFallbacksFor(lang)		local langList = mw.language.getFallbacksFor(lang)
	table.insert(langList,1,lang)		table.insert(langList,1,lang)
	table.insert(langList,math.max(#langList,3),'default')		table.insert(langList,math.max(#langList,2),'default')
	for i,language in ipairs(langList) do		for i,language in ipairs(langList) do
	if list[language] then		if list[language] then
	return list[language]		return list[language]
		⚫	end

	end		end
	end		end
Line 469:		Line 469:
	state.adj2, state.era2, state.units2, state.precision2, state.special)		state.adj2, state.era2, state.units2, state.precision2, state.special)
	state.adj, state.era, state.units, state.precision = state.adj1, state.era1, state.units1, state.precision1		state.adj, state.era, state.units, state.precision = state.adj1, state.era1, state.units1, state.precision1
⚫	end

	-- call specialized functions		-- call specialized functions
Line 481:		Line 480:
	Output = oneDatePhrase(date1, state.adj1, state.era1, state.units1, lang, 1, nil, state)		Output = oneDatePhrase(date1, state.adj1, state.era1, state.units1, lang, 1, nil, state)
	QScode = oneDateQScode(date1, state.adj1, state.era1, state.precision1)		QScode = oneDateQScode(date1, state.adj1, state.era1, state.precision1)
			elseif date1~='' then

			Output = ISOdate(date1, lang, '', 'dtstart', '100-999')

	end		end
			if p.Error~=nil then

	return errorStr		return errorStr
	end		end
Line 496:		Line 495:
	end		end

			return Output .. QScode

			end

	function p.complex_date(frame)		function p.complex_date(frame)

153.185.54.127: Fixed Junk code error

2019-01-24T00:20:51Z

Fixed Junk code error

← Previous revision		Revision as of 00:20, 24 January 2019
Line 31:		Line 31:
	local langList = mw.language.getFallbacksFor(lang)		local langList = mw.language.getFallbacksFor(lang)
	table.insert(langList,1,lang)		table.insert(langList,1,lang)
	table.insert(langList,math.max(#langList,2),'default')		table.insert(langList,math.max(#langList,3),'default')
	for i,language in ipairs(langList) do		for i,language in ipairs(langList) do
	if list[language] then		if list[language] then
	return list[language]		return list[language]

⚫	end
	end		end
	end		end
Line 469:		Line 469:
	state.adj2, state.era2, state.units2, state.precision2, state.special)		state.adj2, state.era2, state.units2, state.precision2, state.special)
	state.adj, state.era, state.units, state.precision = state.adj1, state.era1, state.units1, state.precision1		state.adj, state.era, state.units, state.precision = state.adj1, state.era1, state.units1, state.precision1
		⚫	end

	-- call specialized functions		-- call specialized functions
Line 480:		Line 481:
	Output = oneDatePhrase(date1, state.adj1, state.era1, state.units1, lang, 1, nil, state)		Output = oneDatePhrase(date1, state.adj1, state.era1, state.units1, lang, 1, nil, state)
	QScode = oneDateQScode(date1, state.adj1, state.era1, state.precision1)		QScode = oneDateQScode(date1, state.adj1, state.era1, state.precision1)

	elseif date1~='' then

	Output = ISOdate(date1, lang, '', 'dtstart', '100-999')
	end		end

	if p.Error~=nil then
	return errorStr		return errorStr
	end		end
Line 495:		Line 496:
	end		end


	return Output .. QScode
	end

	function p.complex_date(frame)		function p.complex_date(frame)

Pppery: Rm another phantom dependency; Module:Datei18n is never used (note: the equivalent edit was performed on commons)

2018-09-15T15:01:30Z

Rm another phantom dependency; Module:Datei18n is never used (note: the equivalent edit was performed on commons)

← Previous revision		Revision as of 15:01, 15 September 2018
Line 22:		Line 22:
	local i18n = require('Module:i18n/complex date')		local i18n = require('Module:i18n/complex date')
	local ISOdate = require('Module:ISOdate')._ISOdate		local ISOdate = require('Module:ISOdate')._ISOdate
	local Date = require('Module:DateI18n')._Date -- enwp version of c:Module:Date
	local Calendar = require('Module:Calendar')		local Calendar = require('Module:Calendar')