From 1e892e4a81c705756b60ef199594699734fb0057 Mon Sep 17 00:00:00 2001 From: SyntacticSalt Date: Sun, 18 Jan 2026 17:52:17 +0100 Subject: [PATCH 1/2] feat: Use DateRange in TournamentsListing --- .../commons/TournamentsListing/CardList.lua | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/lua/wikis/commons/TournamentsListing/CardList.lua b/lua/wikis/commons/TournamentsListing/CardList.lua index 9788b684e91..f279224bf1e 100644 --- a/lua/wikis/commons/TournamentsListing/CardList.lua +++ b/lua/wikis/commons/TournamentsListing/CardList.lua @@ -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() @@ -487,22 +488,7 @@ function BaseTournamentsListing._dateDisplay(startDate, endDate, status) 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 tostring(DateRange{startDate = startDate, endDate = endDate, showYear = true}) end ---@private From b79a6cdf861d9957dd9e27c0e27ead2c8ce32750 Mon Sep 17 00:00:00 2001 From: SyntacticSalt Date: Mon, 19 Jan 2026 17:59:46 +0100 Subject: [PATCH 2/2] return widget --- lua/wikis/commons/TournamentsListing/CardList.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lua/wikis/commons/TournamentsListing/CardList.lua b/lua/wikis/commons/TournamentsListing/CardList.lua index f279224bf1e..3fd2eff613e 100644 --- a/lua/wikis/commons/TournamentsListing/CardList.lua +++ b/lua/wikis/commons/TournamentsListing/CardList.lua @@ -313,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 @@ -482,13 +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 - return tostring(DateRange{startDate = startDate, endDate = endDate, showYear = true}) + return DateRange{startDate = startDate, endDate = endDate, showYear = true} end ---@private