Skip to content
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

Euro 2024 matches use BST in all editions #27203

Closed
wants to merge 1 commit into from
+5 −3
Closed

Euro 2024 matches use BST in all editions #27203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions sport/app/football/views/wallchart/knockoutMatch.scala.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
@import common.Edition
@import java.time.LocalTime
@import java.time.ZonedDateTime
@import java.time.ZoneId
@(fm: pa.FootballMatch, round: pa.Round, competition: model.Competition)(implicit request: RequestHeader)

@import implicits.Football._
Expand All @@ -25,8 +26,8 @@
}
@if(fm.isFixture){
<div class="football-match__date">
<span class="football-match__kickoff">@fm.date.format(DateTimeFormatter.ofPattern("HH:mm  z").withZone(Edition(request).timezoneId))</span>
@fm.date.withZoneSameInstant(Edition(request).timezoneId).toLocalDate.format(DateTimeFormatter.ofPattern("E dd MMMM "))
<span class="football-match__kickoff">@fm.date.format(DateTimeFormatter.ofPattern("HH:mm  z").withZone(ZoneId.of("Europe/London")))</span>
@fm.date.withZoneSameInstant(ZoneId.of("Europe/London")).toLocalDate.format(DateTimeFormatter.ofPattern("E dd MMMM "))
</div>
}

Expand Down
3 changes: 2 additions & 1 deletion sport/app/football/views/wallchart/knockoutSpider.scala.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
@import java.time.format.DateTimeFormatter
@import java.time.ZonedDateTime
@import java.time.ZoneId
@import common.Edition
@import java.time.LocalTime
@(competition: model.Competition, knockoutStage: _root_.football.model.KnockoutSpider)(implicit request: RequestHeader)
Expand Down Expand Up @@ -67,5 +68,5 @@
}
</div>

<div class="football-knockout-chart__timezone">All matches are in <span class="football-matches__timezone">@DateTimeFormatter.ofPattern("z").format(ZonedDateTime.of(knockoutStage.matches.head.date.toLocalDate, LocalTime.of(0, 0), Edition(request).timezoneId))</span> time</div>
<div class="football-knockout-chart__timezone">All matches are in <span class="football-matches__timezone">@DateTimeFormatter.ofPattern("z").format(ZonedDateTime.of(knockoutStage.matches.head.date.toLocalDate, LocalTime.of(0, 0), ZoneId.of("Europe/London")))</span> time</div>
</div>