Skip to content

Commit f7e58ce

Browse files
committed
fix: use common time representation
1 parent b6b4651 commit f7e58ce

File tree

4 files changed

+2
-7
lines changed

4 files changed

+2
-7
lines changed

src/main/jte/bookings/list.jte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<td>${booking.getId()} ${booking.getOpenRequests().isEmpty() ? context.empty() : context.localize("bookings.outstanding", booking.getOpenRequests().size())}</td>
3939
<td>${booking.getDescription()}</td>
4040
<td>${context.format(booking.getStartDate())}</td>
41-
<td>${context.format(booking.getEndDate())}</td>
41+
<td>${context.format(booking.getEndDate().toLocalTime())}</td>
4242
<td>${context.localize("bookings.share." + booking.getShareRoomType())}</td>
4343
<td>${context.localize("bookings.priority." + booking.getPriority())}</td>
4444
<td>

src/main/jte/bookings/single.jte

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,7 @@
3535
@if (!booking.getOpenRequests().isEmpty())
3636
<p>${context.localize("bookings.outstanding", booking.getOpenRequests().size())}</p>
3737
@endif
38-
<p>${context.localize("bookings.start.value", context.format(booking.getStartDate()))}</p>
39-
<p>${context.localize("bookings.end.value", context.format(booking.getEndDate()))}</p>
38+
<p>${context.format(booking.getStartDate())} - ${context.format(booking.getEndDate().toLocalTime())}</p>
4039

4140
@if (!booking.getDescription().isBlank())
4241
<label class="label">${context.localize("bookings.description")}</label>

src/main/resources/messages.properties

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,6 @@ administration.statistics.hour=Per Hour
8787
administration.statistics.month=Per Month
8888
administration.statistics.recent=Recent
8989
administration.statistics.all_time=All Time
90-
bookings.start.value=Start: {0}
91-
bookings.end.value=End: {0}
9290
layout.welcome=Welcome, {0}
9391
layout.about=About
9492
layout.legal=Legal

src/main/resources/messages_de.properties

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,6 @@ administration.statistics.hour=Nach Stunde
8282
administration.statistics.month=Nach Monat
8383
administration.statistics.recent=Kürzlich
8484
administration.statistics.all_time=Alle
85-
bookings.start.value=Start: {0}
86-
bookings.end.value=Ende: {0}
8785
layout.welcome=Hallo, {0}
8886
layout.about=Über
8987
layout.legal=Legal

0 commit comments

Comments
 (0)