Module:Complex date/sandbox - Revision history

Jarekt at 15:46, 15 May 2020

2020-05-15T15:46:05Z

← Previous revision		Revision as of 15:46, 15 May 2020
Line 398:		Line 398:
	state.units1 = string.lower(units1 or '')		state.units1 = string.lower(units1 or '')
	state.units2 = string.lower(units2 or '')		state.units2 = string.lower(units2 or '')


	-- if date 1 is missing but date 2 is provided than swap them		-- if date 1 is missing but date 2 is provided than swap them
	if date1 == '' and date2 ~= '' then		if date1 == '' and date2 ~= '' then
Line 406:		Line 406:
	adj2 = '', era2 = '', units2 = '', conj=state.conj, num=1}		adj2 = '', era2 = '', units2 = '', conj=state.conj, num=1}
	end		end
	if date2 ~= '' then state.nDates = 2		if date2 ~= '' then state.nDates = 2
	elseif date1 ~= '' then state.nDates = 1		elseif date1 ~= '' then state.nDates = 1
	else state.nDates = 0		else state.nDates = 0
	end		end


	-- reconcile alternative names for text inputs		-- reconcile alternative names for text inputs
	local conj = checkAliases(state.conj ,'' ,'j')		local conj = checkAliases(state.conj ,'' ,'j')
Line 425:		Line 425:
	return nil		return nil
	end		end


	-- calculate date precision value		-- calculate date precision value
	date1, state.units1, state.precision1 = datePrecision(date1, state.units1)		date1, state.units1, state.precision1 = datePrecision(date1, state.units1)
Line 545:		Line 545:
	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

Jarekt at 15:27, 15 May 2020

2020-05-15T15:27:10Z

← Previous revision		Revision as of 15:27, 15 May 2020
Line 280:		Line 280:

	-- convert isodate to timestamp used by quick statements		-- convert isodate to timestamp used by quick statements
	if precision>=9 then		if precision>=9 then
	if string.match(dateStr,"^%d%d%d%d$") then -- if YYYY format		if string.match(dateStr,"^%d%d%d%d$") then -- if YYYY format
	tStamp = era .. dateStr .. '-00-00T00:00:00Z/9'		tStamp = era .. dateStr .. '-00-00T00:00:00Z/9'
	elseif string.match(dateStr,"^%d%d%d%d%-%d%d$") then -- if YYYY-MM format		elseif string.match(dateStr,"^%d%d%d%d%-%d%d$") then -- if YYYY-MM format
	tStamp = era .. dateStr .. '-00T00:00:00Z/10'		tStamp = era .. dateStr .. '-00T00:00:00Z/10'
	elseif string.match(dateStr,"^%d%d%d%d%-%d%d%-%d%d$") then -- if YYYY-MM-DD format		elseif string.match(dateStr,"^%d%d%d%d%-%d%d%-%d%d$") then -- if YYYY-MM-DD format
	tStamp = era .. dateStr .. 'T00:00:00Z/11'		tStamp = era .. dateStr .. 'T00:00:00Z/11'
	end		end
Line 343:		Line 343:
	if (not d1) or (not d2) then		if (not d1) or (not d2) then
	return ''		return ''
	end		end
	-- find date with lower precision in common to both dates		-- find date with lower precision in common to both dates
	local cd		local cd
Line 350:		Line 350:
	local k = 0		local k = 0
	for i = 1,10,1 do		for i = 1,10,1 do
	if string.sub(d1,1,i)==string.sub(d2,1,i) then		if string.sub(d1,1,i)==string.sub(d2,1,i) then
	k = i -- find last matching letter		k = i -- find last matching letter
	end		end
Line 430:		Line 430:
	date2, state.units2, state.precision2 = datePrecision(date2, state.units2)		date2, state.units2, state.precision2 = datePrecision(date2, state.units2)

	-- Handle special cases		-- Handle special cases
	-- Some complex phrases can be created out of simpler ones. Therefore on pass # 1 we try to create		-- Some complex phrases can be created out of simpler ones. Therefore on pass # 1 we try to create
	-- the phrase using complex phrase and if that is not found than on the second pass we try to build		-- the phrase using complex phrase and if that is not found than on the second pass we try to build
	-- the phrase out of the simpler ones		-- the phrase out of the simpler ones
Line 440:		Line 440:
	state.adj2 = ''		state.adj2 = ''
	end		end
	if state.nDates == 2 and state.adj1=='late' and state.adj2=='early' and state.conj=='and'		if state.nDates == 2 and state.adj1=='late' and state.adj2=='early' and state.conj=='and'
	and state.units1==state.units2 and state.era1==state.era2 then		and state.units1==state.units2 and state.era1==state.era2 then
	if state.units1=='century' then		if state.units1=='century' then
Line 456:		Line 456:
	end		end

	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
	return date1, date2, state		return date1, date2, state
	end		end
Line 468:		Line 468:
	local dateStr		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
	args.lang = frame:callParserFunction( "int", "lang" ) -- get user's chosen language		args.lang = frame:callParserFunction( "int", "lang" ) -- get user's chosen language
	end		end
	local lang = args['lang']		local lang = args['lang']
Line 478:		Line 478:
	if eraType then		if eraType then
	eraType = checkAliases(eraType ,'','e')		eraType = checkAliases(eraType ,'','e')
	dateStr = translatePhrase(dateStr, '', eraType, lang, {})		dateStr = translatePhrase(dateStr, '', eraType, lang, {})
	end		end
	return dateStr		return dateStr
Line 489:		Line 489:

	-- process inputs and save date in state array		-- process inputs and save date in state array
	date1, date2, state = processInputParams(conj, adj1, date1, units1, era1, adj2, date2, units2, era2, lang, passNr)		date1, date2, state = processInputParams(conj, adj1, date1, units1, era1, adj2, date2, units2, era2, lang, passNr)
	if p.Error~=nil then		if p.Error~=nil then
	return nil		return nil
Line 495:		Line 495:

	local errorStr = string.format(		local errorStr = string.format(
	'\n*conj=%s, adj1=%s, era1=%s, unit1=%s, prec1=%i, adj2=%s, era2=%s, unit2=%s, prec2=%i, special=%s',		'\n*conj=%s, adj1=%s, era1=%s, unit1=%s, prec1=%i, adj2=%s, era2=%s, unit2=%s, prec2=%i, special=%s',
	state.conj, state.adj1, state.era1, state.units1, state.precision1,		state.conj, state.adj1, state.era1, state.units1, state.precision1,
	state.adj2, state.era2, state.units2, state.precision2, state.special)		state.adj2, state.era2, state.units2, state.precision2, state.special)

	-- call specialized functions		-- call specialized functions
	local QScode = ''		local QScode = ''
	if state.special~='' then		if state.special~='' then
	Output = otherPhrases(date1, date2, state.special, state.era1, lang, state)		Output = otherPhrases(date1, date2, state.special, state.era1, lang, state)
	elseif state.conj~='' then		elseif state.conj~='' then
	QScode = twoDateQScode(date1, date2, state)		QScode = twoDateQScode(date1, date2, state)
Line 535:		Line 535:
	if certainty and LUT[certainty] then		if certainty and LUT[certainty] then
	local state = {}		local state = {}
	date1, date2, state = processInputParams(conj, adj1, date1, units1, era1, adj2, date2, units2, era2, lang, 1)		date1, date2, state = processInputParams(conj, adj1, date1, units1, era1, adj2, date2, units2, era2, lang, 1)
	dateStr = translatePhrase(dateStr, '', certainty, lang, state)		dateStr = translatePhrase(dateStr, '', certainty, lang, state)
	dateStr = string.gsub(dateStr, '(%<div style="display: none;"%>date QS:P,[^%<]+)(%</div%>)', '%1,P1480,' .. LUT[certainty] .. '%2' )		dateStr = string.gsub(dateStr, '(%<div style="display: none;"%>date QS:P,[^%<]+)(%</div%>)', '%1,P1480,' .. LUT[certainty] .. '%2' )
Line 547:		Line 547:
	local dateStr, Error		local dateStr, Error
	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
	args.lang = frame:callParserFunction( "int", "lang" ) -- get user's chosen language		args.lang = frame:callParserFunction( "int", "lang" ) -- get user's chosen language
	end		end
	local date1 = args['date1'] or args['2'] or args['date'] or ''		local date1 = args['date1'] or args['2'] or args['date'] or ''

Jarekt at 15:16, 15 May 2020

2020-05-15T15:16:35Z

← Previous revision		Revision as of 15:16, 15 May 2020
Line 9:		Line 9:
	This module is intended for creation of complex date phrases in variety of languages.		This module is intended for creation of complex date phrases in variety of languages.

	Once deployed, please do not modify this code without applying the changes first at Module:Complex date/sandbox and testing		Once deployed, please do not modify this code without applying the changes first at Module:Complex date/sandbox and testing
	at Module:Complex date/sandbox/testcases.		at Module:Complex date/sandbox/testcases.

	Authors and maintainers:		Authors and maintainers:
	* User:Sn1per - first draft of the original version		* User:Sn1per - first draft of the original version
	* User:Jarekt - corrections and expansion of the original version		* User:Jarekt - corrections and expansion of the original version
	]]		]]

Line 21:		Line 21:
	local i18n = require('Module:i18n/complex date') -- used for translations of date related phrases		local i18n = require('Module:i18n/complex date') -- used for translations of date related phrases
	local ISOdate = require('Module:ISOdate')._ISOdate -- used for parsing dates in YYYY-MM-DD and related formats		local ISOdate = require('Module:ISOdate')._ISOdate -- used for parsing dates in YYYY-MM-DD and related formats
	local Calendar -- loaded lazily		local Calendar -- loaded lazily

	-- ==================================================		-- ==================================================
Line 233:		Line 233:
	-- based on string or numeric input calculate "Units" and "precision"		-- based on string or numeric input calculate "Units" and "precision"
	local precision		local precision
	local dateNum = tonumber(dateStr)
	if type(units)=='number' then		if type(units)=='number' then
	precision = units		precision = units

Jarekt at 15:11, 15 May 2020

2020-05-15T15:11:20Z

Jarekt at 15:04, 15 May 2020

2020-05-15T15:04:30Z

← Previous revision		Revision as of 15:04, 15 May 2020
Line 21:		Line 21:
	local i18n = require('Module:i18n/complex date') -- used for translations of date related phrases		local i18n = require('Module:i18n/complex date') -- used for translations of date related phrases
	local ISOdate = require('Module:ISOdate')._ISOdate -- used for parsing dates in YYYY-MM-DD and related formats		local ISOdate = require('Module:ISOdate')._ISOdate -- used for parsing dates in YYYY-MM-DD and related formats
			local Calendar -- loaded lazily
	local formatnum = require('Module:Formatnum').formatNum -- used for translation into other alphabets
	local Calendar = require('Module:Calendar') -- used for conversions between Julian and Gregorian calendar dates

	-- ==================================================		-- ==================================================
Line 45:		Line 44:
	local LList = {bn=1,bpy=1,kn=1,hi=1,mr=1,new=1,pa=1,gu=1,fa=1,glk=1,mzn=1,ur=1,ar=1,ckb=1,ks=1,lo=1,['or']=1,bo=1,['ml-old']=1,mn=1,te=1,th=1}		local LList = {bn=1,bpy=1,kn=1,hi=1,mr=1,new=1,pa=1,gu=1,fa=1,glk=1,mzn=1,ur=1,ar=1,ckb=1,ks=1,lo=1,['or']=1,bo=1,['ml-old']=1,mn=1,te=1,th=1}
	if LList[lang] then -- call only when the language is on the list		if LList[lang] then -- call only when the language is on the list
	numStr = ~~formatnum~~(numStr, lang, 1)		numStr = require('Module:Formatnum').formatNum(numStr, lang, 1)
	end		end
	return numStr		return numStr
Line 168:		Line 167:
	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") -- lazy loding (only if needed)
			end
	local JDN = Calendar._date2jdn(date1, 0)		local JDN = Calendar._date2jdn(date1, 0)
	if JDN then		if JDN then
Line 179:		Line 181:
	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
	local dt = 1;		local dt = 1
	if operation == 'turn of the decade' then dt=10 end		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
Line 231:		Line 233:
	-- based on string or numeric input calculate "Units" and "precision"		-- based on string or numeric input calculate "Units" and "precision"
	local precision		local precision
	local dateNum = tonumber(dateStr);		local dateNum = tonumber(dateStr)
	if type(units)=='number' then		if type(units)=='number' then
	precision = units		precision = units
Line 241:		Line 243:
	end		end
	elseif type(units)=='string' then		elseif type(units)=='string' then
	units = string.lower(units);		units = string.lower(units)
	if units=='millennium' then precision=6		if units=='millennium' then precision=6
	elseif units=='century' then precision=7		elseif units=='century' then precision=7

Jarekt: adjust whitespaces

2020-05-15T14:58:12Z

adjust whitespaces

← Previous revision		Revision as of 14:58, 15 May 2020
Line 1:		Line 1:
	--[[		--[[
	__ __ _ _ ____ _ _ _		__ __ _ _ ____ _ _
	\| \/ \| ___ __\| \|_ _\| \| ___ _ / ___\|___ _ __ ___ _ __ \| \| _____ __ __\| \| __ _\| \|_ ___		\| \/ \| ___ __\| \|_ _\| \| ___ _ / ___\|___ _ __ ___ _ __ \| \| _____ __ __\| \| __ _\| \|_ ___
	\| \|\/\| \|/ _ \ / _` \| \| \| \| \|/ _ (_) \| / _ \\| '_ ` _ \\| '_ \\| \|/ _ \ \/ / / _` \|/ _` \| __/ _ \		\| \|\/\| \|/ _ \ / _` \| \| \| \| \|/ _ (_) \| / _ \\| '_ ` _ \\| '_ \\| \|/ _ \ \/ / / _` \|/ _` \| __/ _ \
	\| \| \| \| (_) \| (_\| \| \|_\| \| \| __/_\| \|__\| (_) \| \| \| \| \| \| \|_) \| \| __/> < \| (_\| \| (_\| \| \|\| __/		\| \| \| \| (_) \| (_\| \| \|_\| \| \| __/_\| \|__\| (_) \| \| \| \| \| \| \|_) \| \| __/> < \| (_\| \| (_\| \| \|\| __/
	\|_\| \|_\|\___/ \__,_\|\__,_\|_\|\___(_)\____\___/\|_\| \|_\| \|_\| .__/\|_\|\___/_/\_\ \__,_\|\__,_\|\__\___\|		\|_\| \|_\|\___/ \__,_\|\__,_\|_\|\___(_)\____\___/\|_\| \|_\| \|_\| .__/\|_\|\___/_/\_\ \__,_\|\__,_\|\__\___\|
	\|_\|		\|_\|


	This module is intended for creation of complex date phrases in variety of languages.		This module is intended for creation of complex date phrases in variety of languages.


	Once deployed, please do not modify this code without applying the changes first at Module:Complex date/sandbox and testing		Once deployed, please do not modify this code without applying the changes first at Module:Complex date/sandbox and testing
	at Module:Complex date/sandbox/testcases.		at Module:Complex date/sandbox/testcases.


	Authors and maintainers:		Authors and maintainers:
	* User:Sn1per - first draft of the original version		* User:Sn1per - first draft of the original version
	* User:Jarekt - corrections and expansion of the original version		* User:Jarekt - corrections and expansion of the original version

	]]		]]

Line 208:		Line 207:
	local function checkAliases(str1, str2, sType)		local function checkAliases(str1, str2, sType)
	-- some inputs have many aliases - reconcile them and ensure string is playing a proper role		-- some inputs have many aliases - reconcile them and ensure string is playing a proper role
	local out = ''		local out = ''
	if str1 and str1~='' then		if str1 and str1~='' then
	local 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]
	else		else
	p.Error = string.format('<span style="background-color:red;">Error in [[Module:Complex date]]: %s is not recognized.</span>', str1)		p.Error = string.format('<span style="background-color:red;">Error in [[Module:Complex date]]: %s is not recognized.</span>', str1)
		⚫	end
		⚫	elseif str2 and str2~='' then -- if "str1" of type "sType" is empty than maybe ...
		⚫	local a = i18n.Synonyms[str2] -- ..."str2" is of the same type and is not empty
		⚫	if a and a[2]==sType then
		⚫	out = a[1]
		⚫	str2 = ''
		⚫	end
	end		end
		⚫	return out, str2
⚫	elseif str2 and str2~='' then -- if "str1" of type "sType" is empty than maybe ...
⚫	local a = i18n.Synonyms[str2] -- ..."str2" is of the same type and is not empty
⚫	if a and a[2]==sType then
⚫	out = a[1]
⚫	str2 = ''
⚫	end
⚫	end
⚫	return out, str2
	end		end

	-- =======================================================================		-- =======================================================================
	local function datePrecision(dateStr, units)		local function datePrecision(dateStr, units)
	-- "in this module "Units" is a string like millennium, century, or decade		-- "in this module "Units" is a string like millennium, century, or decade
	-- "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
Line 236:		Line 235:
	precision = units		precision = units
	if precision>11 then precision=11 end -- clip the range of precision values		if precision>11 then precision=11 end -- clip the range of precision values
	if precision==6 then units='millennium'		if precision==6 then units='millennium'
	elseif precision==7 then units='century'		elseif precision==7 then units='century'
	elseif precision==8 then units='decade'		elseif precision==8 then units='decade'
Line 329:		Line 328:
	outputStr = century ..",".. qualitier ..","..d		outputStr = century ..",".. qualitier ..","..d
	end		end
	return outputStr		return outputStr
	end		end

Line 349:		Line 348:
	local year2 = tonumber(string.sub(d2,2,5))		local year2 = tonumber(string.sub(d2,2,5))
	local k = 0		local k = 0
	for i = 1,10,1 do		for i = 1,10,1 do
	if string.sub(d1,1,i)==string.sub(d2,1,i) then		if string.sub(d1,1,i)==string.sub(d2,1,i) then
	k = i -- find last matching letter		k = i -- find last matching letter
Line 389:		Line 388:
	local function processInputParams(conj, adj1, date1, units1, era1, adj2, date2, units2, era2, lang, passNr)		local function processInputParams(conj, adj1, date1, units1, era1, adj2, date2, units2, era2, lang, passNr)

	-- process inputs and save date in state array		-- process inputs and save date in state array
	local state = {}		local state = {}
	state.conj = string.lower(conj or '')		state.conj = string.lower(conj or '')
Line 465:		Line 464:

	function p.Era(frame)		function p.Era(frame)
	-- process inputs		-- process inputs
	local dateStr		local dateStr
	local args = frame.args		local args = frame.args
Line 482:		Line 481:
	return dateStr		return dateStr
	end		end


	-- =======================================================================		-- =======================================================================
	function p._complex_date(conj, adj1, date1, units1, era1, adj2, date2, units2, era2, lang, passNr)		function p._complex_date(conj, adj1, date1, units1, era1, adj2, date2, units2, era2, lang, passNr)
Line 488:		Line 487:
	local state		local state

	-- process inputs and save date in state array		-- process inputs and save date in state array
	date1, date2, state = processInputParams(conj, adj1, date1, units1, era1, adj2, date2, units2, era2, lang, passNr)		date1, date2, state = processInputParams(conj, adj1, date1, units1, era1, adj2, date2, units2, era2, lang, passNr)
	if p.Error~=nil then		if p.Error~=nil then
Line 544:		Line 543:
	-- =======================================================================		-- =======================================================================
	function p.complex_date(frame)		function p.complex_date(frame)
	-- process inputs		-- process inputs
	local dateStr, Error		local dateStr, Error
	local args = frame.args		local args = frame.args

Jarekt: synch with master copy on Commons

2020-05-15T14:49:25Z

synch with master copy on Commons

Show changes

RexxS: local eraLUT

2020-05-14T20:58:05Z

local eraLUT

← Previous revision		Revision as of 20:58, 14 May 2020
Line 267:		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: local precision

2020-05-14T20:56:33Z

local precision

← Previous revision		Revision as of 20:56, 14 May 2020
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

RexxS: local a

2020-05-14T20:54:20Z

local a

← Previous revision		Revision as of 20:54, 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]

← Previous revision		Revision as of 15:11, 15 May 2020
Line 40:		Line 40:
	-- ==================================================		-- ==================================================
	local function formatnum1(numStr, lang)		local function formatnum1(numStr, lang)
	-- mostly require('Module:Formatnum').formatNum function used to translate a number to use different numeral characters,		-- mostly require('Module:Formatnum').formatNum function used to translate a number to use different numeral characters,
	-- except that it it does not call that function unless the language is on the list "LList"		-- except that it it does not call that function unless the language is on the list "LList"
	local LList = {bn=1,bpy=1,kn=1,hi=1,mr=1,new=1,pa=1,gu=1,fa=1,glk=1,mzn=1,ur=1,ar=1,ckb=1,ks=1,lo=1,['or']=1,bo=1,['ml-old']=1,mn=1,te=1,th=1}		local LList = {bn=1,bpy=1,kn=1,hi=1,mr=1,new=1,pa=1,gu=1,fa=1,glk=1,mzn=1,ur=1,ar=1,ckb=1,ks=1,lo=1,['or']=1,bo=1,['ml-old']=1,mn=1,te=1,th=1}
Line 100:		Line 100:
	-- translate a single date phrase		-- translate a single date phrase
	if num==2 then		if num==2 then
	state.adj, state.era, state.units, state.precision = state.adj2, state.era2, state.units2, state.precision2		state.adj, state.era, state.units, state.precision = state.adj2, state.era2, state.units2, state.precision2
	end		end

	-- dateStr can have many forms: ISO date, year or a number for		-- dateStr can have many forms: ISO date, year or a number for
	-- decade, century or millennium		-- decade, century or millennium
	if units == '' then -- unit is "year", "month", "day"		if units == '' then -- unit is "year", "month", "day"
Line 111:		Line 111:
	end		end

	-- add adjective ("early", "mid", etc.) or preposition ("before", "after",		-- add adjective ("early", "mid", etc.) or preposition ("before", "after",
	-- "circa", etc.) to the date		-- "circa", etc.) to the date
	if adj ~= '' then		if adj ~= '' then
Line 180:		Line 180:
	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
	local dt = 1		local dt = 1
	if operation == 'turn of the decade' then dt=10 end		if operation == 'turn of the decade' then dt=10 end
Line 258:		Line 258:
	units=''		units=''
	end		end
	if precision==6 and dateStr.match( dateStr, '%d000' )~=nil then		if precision==6 and dateStr.match( dateStr, '%d000' )~=nil then
	dateStr = tostring(math.floor(tonumber(dateStr)/1000) +1)		dateStr = tostring(math.floor(tonumber(dateStr)/1000) +1)
	elseif precision==7 and mw.ustring.match( dateStr, '%d%d00' )~=nil then		elseif precision==7 and mw.ustring.match( dateStr, '%d%d00' )~=nil then