Module:Soldier - Revision history

Admin: Infobox: drop certificate/arrive/depart/years; expand other_class codes

2026-09-16T21:40:15Z

Infobox: drop certificate/arrive/depart/years; expand other_class codes

@@ Line 709: / Line 709: @@
 	end
 	return prettyProse(s)
 end
@@ Line 1,916: / Line 2,007: @@
 		addRow(tbl, 'Arm / service', prettyProse(armName))
 	end
-	addRow(tbl, 'Years of service', prettyProse(parentArg(frame, 'years_of_service')))
+	-- years_of_service / date_arrive / date_depart / certificate stay in Technical
 	addRow(tbl, 'ASN', parentArg(frame, 'asn'), 'serial')
@@ Line 1,938: / Line 2,030: @@
 	end
 	addRow(tbl, 'Section', mw.ustring.upper(parentArg(frame, 'class_section')))
-	addRow(tbl, 'Other class', parentArg(frame, 'other_class'))
+	addRow(tbl, 'Other class', expandOtherClass(parentArg(frame, 'other_class')))
 	local enlist = prettyPlace(parentArg(frame, 'enlistment_place'))
@@ Line 1,948: / Line 2,040: @@
 	addRow(tbl, 'Battles / wars', formatBattles(parentArg(frame, 'battles')))
 	addTeamsInfoboxRow(tbl, frame)
 	-- Awards ribbons render in the article body (p.awardsSection), not this

Admin: Infobox: drop State (NARA residence); keep in Technical record

2026-09-16T21:30:45Z

Infobox: drop State (NARA residence); keep in Technical record

← Older revision		Revision as of 21:30, 16 September 2026
Line 1,871:		Line 1,871:
	awards = trim(first or awards)		awards = trim(first or awards)
	end		end
	~~local state = prettyPlace(parentArg(frame, 'state'))~~

	local function datePlaceCell(date, place, year)		local function datePlaceCell(date, place, year)
Line 1,890:		Line 1,889:

	if alias ~= '' or birth ~= '' or death ~= '' or nativity ~= ''		if alias ~= '' or birth ~= '' or death ~= '' or nativity ~= ''
	or religion ~= '' or knownFor ~= '' or awards ~~~= '' or state~~ ~= '' then		or religion ~= '' or knownFor ~= '' or awards ~= '' then
	addHeader(tbl, 'Personal details')		addHeader(tbl, 'Personal details')
	end		end
Line 1,901:		Line 1,900:
	addRow(tbl, 'Known for', knownFor)		addRow(tbl, 'Known for', knownFor)
	addRow(tbl, 'Awards', awards)		addRow(tbl, 'Awards', awards)
	~~if state ~= '' then~~
	~~addRow(tbl, 'State', state)~~
	~~end~~

	addHeader(tbl, 'Military service')		addHeader(tbl, 'Military service')

Admin: Infobox: drop Education / Spouse-marital / Occupation (NARA stays in Technical record)

2026-09-16T21:26:31Z

Infobox: drop Education / Spouse-marital / Occupation (NARA stays in Technical record)

← Older revision		Revision as of 21:26, 16 September 2026
Line 1,861:		Line 1,861:
	local nativity = expandNativity(parentArg(frame, 'nativity'))		local nativity = expandNativity(parentArg(frame, 'nativity'))
	local religion = expandReligion(parentArg(frame, 'religion'))		local religion = expandReligion(parentArg(frame, 'religion'))
	~~local~~ marital ~~= prettyProse(parentArg~~(~~frame, 'marital')~~)		-- education / marital / occupation stay in Technical record (NARA snapshot);
	~~local education = prettyProse(parentArg(frame~~, ~~'education'))~~		-- curated life facts belong in Biography / Timeline, not the infobox.
	~~local occupation = prettyProse(parentArg(frame, 'occupation'))~~
	local knownFor = prettyProse(parentArg(frame, 'known_for'))		local knownFor = prettyProse(parentArg(frame, 'known_for'))
	local awards = prettyProse(parentArg(frame, 'awards'))		local awards = prettyProse(parentArg(frame, 'awards'))
Line 1,891:		Line 1,890:

	if alias ~= '' or birth ~= '' or death ~= '' or nativity ~= ''		if alias ~= '' or birth ~= '' or death ~= '' or nativity ~= ''
	or religion ~~~= '' or marital ~= '' or education ~= ''~~		or religion ~= '' or knownFor ~= '' or awards ~= '' or state ~= '' then
	~~or occupation~~ ~= '' or knownFor ~= '' or awards ~= '' or state ~= '' then
	addHeader(tbl, 'Personal details')		addHeader(tbl, 'Personal details')
	end		end
Line 1,901:		Line 1,899:
	addRow(tbl, 'Nativity', nativity)		addRow(tbl, 'Nativity', nativity)
	addRow(tbl, 'Religion', religion)		addRow(tbl, 'Religion', religion)
	~~addRow(tbl, 'Spouse / marital', marital)~~
	~~addRow(tbl, 'Education', education)~~
	~~addRow(tbl, 'Occupation', occupation)~~
	addRow(tbl, 'Known for', knownFor)		addRow(tbl, 'Known for', knownFor)
	addRow(tbl, 'Awards', awards)		addRow(tbl, 'Awards', awards)

Admin: Interview cue: accept legacy items key as interviews alias

2026-09-16T20:58:32Z

Interview cue: accept legacy items key as interviews alias

← Older revision		Revision as of 20:58, 16 September 2026
Line 2,517:		Line 2,517:
	return ''		return ''
	end		end
			-- Prefer interviews; accept legacy `items` key from hand-edited cues.
	local interviews = rec.interviews		local interviews = rec.interviews
			if type(interviews) ~= 'table' then
			interviews = rec.items
			end
	local films = rec.films		local films = rec.films
	local nInterviews = seqCount(interviews)		local nInterviews = seqCount(interviews)

Admin: Treat bare NG class-chart markers as negative research notes

2026-09-16T17:44:23Z

Treat bare NG class-chart markers as negative research notes

← Older revision		Revision as of 17:44, 16 September 2026
Line 718:		Line 718:
	local lower = mw.ustring.lower(s)		local lower = mw.ustring.lower(s)
	if lower == 'failed' or mw.ustring.find(lower, '^failed%s') or mw.ustring.find(lower, '%sfailed%s') or mw.ustring.find(lower, '%sfailed$') then		if lower == 'failed' or mw.ustring.find(lower, '^failed%s') or mw.ustring.find(lower, '%sfailed%s') or mw.ustring.find(lower, '%sfailed$') then
			return true
			end
			-- Bare class-chart non-graduate marker (e.g. "NG Class 10 OB", trailing "NG")
			if lower == 'ng' or mw.ustring.find(lower, '^ng%s') or mw.ustring.find(lower, '%sng%s') or mw.ustring.find(lower, '%sng$') or mw.ustring.find(lower, 'nongrad') then
	return true		return true
	end		end

Admin: Interview cue: Listen to for audio oral histories

2026-09-16T14:01:22Z

Interview cue: Listen to for audio oral histories

← Older revision		Revision as of 14:01, 16 September 2026
Line 2,524:		Line 2,524:
	if nInterviews > 0 then		if nInterviews > 0 then
	local links = {}		local links = {}
			local anyAudio = false
	for _, item in ipairs(interviews) do		for _, item in ipairs(interviews) do
	local heading = item.heading or 'Interview'		local heading = item.heading or 'Interview'
	local short = item.short or heading		local short = item.short or heading
			if item.kind == 'audio' then
			anyAudio = true
			end
	table.insert(		table.insert(
	links,		links,
Line 2,533:		Line 2,537:
	end		end
	local label = nInterviews == 1 and 'Interview' or 'Interviews'		local label = nInterviews == 1 and 'Interview' or 'Interviews'
			local verb = 'Watch'
			if nInterviews == 1 and interviews[1].kind == 'audio' then
			verb = 'Listen to'
			elseif anyAudio and nInterviews > 1 then
			verb = 'Hear'
			end
	local body		local body
	if nInterviews == 1 then		if nInterviews == 1 then
	body = string.format(		body = string.format(
	'~~Watch~~ %s on [[Ritchie Boy Interviews#%s\|%s]].',		'%s %s on [[Ritchie Boy Interviews#%s\|%s]].',
			verb,
	name,		name,
	interviews[1].heading,		interviews[1].heading,
Line 2,543:		Line 2,554:
	else		else
	body = string.format(		body = string.format(
	'~~Watch~~ %s in %d ~~videos~~ on [[Ritchie Boy Interviews]]: %s.',		'%s %s in %d recordings on [[Ritchie Boy Interviews]]: %s.',
			verb,
	name,		name,
	nInterviews,		nInterviews,

Admin: Display class_section in uppercase

2026-09-16T04:59:19Z

Display class_section in uppercase

← Older revision		Revision as of 04:59, 16 September 2026
Line 1,942:		Line 1,942:
	addRow(tbl, 'Camp Ritchie', 'Class ' .. table.concat(classBits, ', '))		addRow(tbl, 'Camp Ritchie', 'Class ' .. table.concat(classBits, ', '))
	end		end
	addRow(tbl, 'Section', parentArg(frame, 'class_section'))		addRow(tbl, 'Section', mw.ustring.upper(parentArg(frame, 'class_section')))
	addRow(tbl, 'Other class', parentArg(frame, 'other_class'))		addRow(tbl, 'Other class', parentArg(frame, 'other_class'))

Admin: Teammates rail: live category hosts for Common.js

2026-09-13T19:38:33Z

Teammates rail: live category hosts for Common.js

@@ Line 2,441: / Line 2,441: @@
 end
--- related-rail: teams-only cache bump
+-- related-rail: live team rosters via category members (filled by Common.js)
 function p.relatedSoldiers(frame)
 	local pageTitle = mw.title.getCurrentTitle().prefixedText
 	-- Same sources as the infobox Teams row: roster IPW, |teams=, research notes.
@@ Line 2,510: / Line 2,457: @@
 	addTeams(namesFromTeamsParam(parentArg(frame, 'teams')))
 	addTeams(noteTeamNames(pageResearchNotesText()))
 	for _, teamName in ipairs(teamNames) do
-		addTeamBlock(teamName)
+		local cat = 'Category:Team ' .. teamName
 	end
-	if #sections == 0 then
+	wrap:tag('div')
-		return ''
+		:addClass('soldier-related-note')
-	end
+		:wikitext(
-	return '<div class="soldier-related">'
+			'These are other soldiers listed on the same team roster. '
-		.. '<div class="soldier-related-heading">Teammates</div>'
+				.. 'People moved between teams; overlapping service dates are not always documented.'
-		.. table.concat(sections, '\n')
-		.. '<div class="soldier-related-note">These are other soldiers listed on the same team roster. '
+	return tostring(wrap)
 end

Admin: Class links go to Category:Class N (merged roster + dates)

2026-09-13T19:04:58Z

Class links go to Category:Class N (merged roster + dates)

← Older revision		Revision as of 19:04, 13 September 2026
Line 824:		Line 824:
	if withPrefix then		if withPrefix then
	if dates ~= '' then		if dates ~= '' then
	table.insert(out, string.format('[[Class %s]] (%s)', part, dates))		table.insert(out, string.format('[[:Category:Class %s\|Class %s]] (%s)', part, part, dates))
	else		else
	table.insert(out, string.format('[[Class %s]]', part))		table.insert(out, string.format('[[:Category:Class %s\|Class %s]]', part, part))
	end		end
	else		else
	if dates ~= '' then		if dates ~= '' then
	table.insert(out, string.format('[[Class %s\|%s]] (%s)', part, part, dates))		table.insert(out, string.format('[[:Category:Class %s\|%s]] (%s)', part, part, dates))
	else		else
	table.insert(out, string.format('[[Class %s\|%s]]', part, part))		table.insert(out, string.format('[[:Category:Class %s\|%s]]', part, part))
	end		end
	end		end

Admin: Center award labels under matching ribbon images in one rack table

2026-09-12T03:22:19Z

Center award labels under matching ribbon images in one rack table

← Older revision		Revision as of 03:22, 12 September 2026
Line 1,463:		Line 1,463:
	end		end

	local function ~~formatAwardsRibbons~~(raw, rowRaw)		local function awardRibbonRows(raw, rowRaw)
	-- Prefer explicit Wikipedia row layout when present		-- Prefer explicit Wikipedia row layout when present
	local rows = splitAwardRows(rowRaw or '')		local rows = splitAwardRows(rowRaw or '')
	if #rows == 0 then		if #rows > 0 then
	raw = trim(raw)		return rows
	if raw == '' then		end
	return ''		raw = trim(raw)
			if raw == '' then
			return {}
			end
			local files = {}
			for part in mw.text.gsplit(raw, ';', true) do
			part = trim(part)
			part = mw.ustring.gsub(part, '^[Ff]ile:', '')
			if part ~= '' then
			table.insert(files, part)
	end		end
	local ~~files~~ = {}		end
	for ~~part~~ in ~~mw.text.gsplit~~(~~raw, ';', true~~) do		if #files == 0 then
	~~part = trim(part)~~		return {}
	~~part = mw~~.~~ustring.gsub~~(~~part, '^[Ff]ile:'~~, '')		end
	if ~~part ~~~= '' then		-- Fallback: pack ~4 across
	table.insert(~~files~~, ~~part~~)		local perRow = 4
	~~end~~		rows = {}
			local cur = {}
			for _, file in ipairs(files) do
			table.insert(cur, file)
			if #cur == perRow then
			table.insert(rows, cur)
			cur = {}
	end		end
	if #~~files ==~~ 0 then		end
	return ''		if #cur > 0 then
	end		table.insert(rows, cur)
	~~-- Fallback: pack ~4 across~~		end
	local ~~perRow~~ = 4		return rows
	~~rows = {}~~		end
	~~local cur = {}~~
	for _, ~~file~~ in ipairs(~~files~~) do		local function awardRowsMatch(ribbonRows, labelRows)
	~~table.insert(cur, file)~~		if #ribbonRows == 0 or #ribbonRows ~= #labelRows then
	if #~~cur~~ =~~= perRow then~~		return false
	~~table.insert~~(~~rows, cur)~~		end
	~~cur =~~ {}		for i, cells in ipairs(ribbonRows) do
	~~end~~		if #cells ~= #(labelRows[i] or {}) then
	~~end~~		return false
	~~if #cur > 0~~ then
	~~table.insert(rows, cur)~~
	end		end
	end		end
	-- One table per row so short rows (e.g. 2 ribbons) center like full rows		return true
			end

			local function formatAwardsRibbons(raw, rowRaw, labelRaw)
			local rows = awardRibbonRows(raw, rowRaw)
			if #rows == 0 then
			return '', false
			end
			local labelRows = splitAwardRows(labelRaw or '')
			local labeled = awardRowsMatch(rows, labelRows)
			-- One table per row so short rows (e.g. 2 ribbons) center like full rows.
			-- When labels match ribbon cells, put captions in the same table so each
			-- name sits centered under its ribbon (equal column widths).
	local out = {}		local out = {}
	for _, cells in ipairs(rows) do		for i, cells in ipairs(rows) do
	table.insert(out, '{\| class="soldier-ribbon-rack"')		if labeled then
			table.insert(out, '{\| class="soldier-ribbon-rack soldier-awards-labeled"')
			else
			table.insert(out, '{\| class="soldier-ribbon-rack"')
			end
	table.insert(out, '\|-')		table.insert(out, '\|-')
	for _, file in ipairs(cells) do		for _, file in ipairs(cells) do
	file = mw.ustring.gsub(file, '^[Ff]ile:', '')		file = mw.ustring.gsub(file, '^[Ff]ile:', '')
	table.insert(out, '\| [[File:' .. file .. '\|106px\|link=]]')		table.insert(out, '\| [[File:' .. file .. '\|106px\|link=]]')
			end
			if labeled then
			table.insert(out, '\|-')
			for _, label in ipairs(labelRows[i]) do
			table.insert(out, '\| class="soldier-award-caption" \| ' .. label)
			end
	end		end
	table.insert(out, '\|}')		table.insert(out, '\|}')
	end		end
	return table.concat(out, '\n')		return table.concat(out, '\n'), labeled
	end		end

Line 1,929:		Line 1,964:

	function p.awardsSection(frame)		function p.awardsSection(frame)
	local ribbons = formatAwardsRibbons(		local gridRaw = parentArg(frame, 'awards_grid')
			local ribbons, labelsInRack = formatAwardsRibbons(
	parentArg(frame, 'awards_ribbons'),		parentArg(frame, 'awards_ribbons'),
	parentArg(frame, 'awards_ribbon_rows')		parentArg(frame, 'awards_ribbon_rows'),
			gridRaw
	)		)
	local grid = formatAwardsGrid(~~parentArg(frame, 'awards_grid')~~)		-- Skip the separate label table when captions already sit under ribbons
			local grid = ''
			if not labelsInRack then
			grid = formatAwardsGrid(gridRaw)
			end
	local extras = formatAwardsLegend(parentArg(frame, 'awards_extra'))		local extras = formatAwardsLegend(parentArg(frame, 'awards_extra'))
	-- Fallback: flat awards list when no grid was extracted		-- Fallback: flat awards list when no grid was extracted
	if grid == '' and extras == '' then		if grid == '' and extras == '' and not labelsInRack then
	extras = formatAwardsLegend(parentArg(frame, 'awards'))		extras = formatAwardsLegend(parentArg(frame, 'awards'))
	end		end