Skip to content

feat: Use DateRange in TournamentsListing #6977

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mbergen wants to merge 2 commits into
base: main
Choose a base branch
from
+4 −18
Open

feat: Use DateRange in TournamentsListing #6977

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e892e4
feat: Use DateRange in TournamentsListing
mbergen Jan 18, 2026
b79a6cd
return widget
mbergen Jan 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 4 additions & 18 deletions lua/wikis/commons/TournamentsListing/CardList.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ local HighlightConditions = Lua.import('Module:HighlightConditions')
local Tier = Lua.import('Module:Tier/Custom')

local HtmlWidgets = Lua.import('Module:Widget/Html/All')
local DateRange = Lua.import('Module:Widget/Misc/DateRange')

local DEFAULT_START_YEAR = Info.startYear
local DEFAULT_END_YEAR = DateExt.getYearOf()
Expand Down Expand Up @@ -312,7 +313,7 @@ function BaseTournamentsListing:_row(tournamentData)

local dateCell = row:tag('div')
:addClass('gridCell EventDetails Date Header')
:wikitext(BaseTournamentsListing._dateDisplay(tournamentData.startdate, tournamentData.enddate, status))
:node(BaseTournamentsListing._dateDisplay(tournamentData.startdate, tournamentData.enddate, status))

if status == POSTPONED or status == DELAYED then
dateCell
Expand Down Expand Up @@ -481,28 +482,13 @@ end
---@param startDate string
---@param endDate string
---@param status string?
---@return string
---@return Widget|string
function BaseTournamentsListing._dateDisplay(startDate, endDate, status)
if status == POSTPONED or status == DELAYED then
return 'Postponed'
end

if startDate == endDate then
return LANG:formatDate('M j, Y', startDate) --[[@as string]]
end

local startYear, startMonth = startDate:match('(%d+)-(%d+)-%d+')
local endYear, endMonth = endDate:match('(%d+)-(%d+)-%d+')

if startYear ~= endYear then
return LANG:formatDate('M j, Y', startDate) .. ' - ' .. LANG:formatDate('M j, Y', endDate)
end

if startMonth == endMonth then
return LANG:formatDate('M j', startDate) .. ' - ' .. LANG:formatDate('j, Y', endDate)
end

return LANG:formatDate('M j', startDate) .. ' - ' .. LANG:formatDate('M j, Y', endDate)
return DateRange{startDate = startDate, endDate = endDate, showYear = true}
end

---@private
Expand Down
Loading