Skip to content

Commit f577dfd

Browse files
committed
Show time based on locale to support 12 hour and 24 hour notation in UI.
1 parent c833da9 commit f577dfd

File tree

2 files changed

+2
-6
lines changed
  • core/trino-web-ui/src/main/resources

2 files changed

+2
-6
lines changed

core/trino-web-ui/src/main/resources/webapp-preview/src/utils/utils.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -319,9 +319,7 @@ export function parseDuration(value: string): number | null {
319319
}
320320

321321
export function formatShortTime(date: Date): string {
322-
const hours = date.getHours() % 12 || 12
323-
const minutes = (date.getMinutes() < 10 ? '0' : '') + date.getMinutes()
324-
return hours + ':' + minutes + (date.getHours() >= 12 ? 'pm' : 'am')
322+
return date.toLocaleTimeString([], { timeStyle: 'short' })
325323
}
326324

327325
export function formatShortDateTime(date: Date): string {

core/trino-web-ui/src/main/resources/webapp/src/utils.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -501,9 +501,7 @@ export function parseDuration(value: string): ?number {
501501
}
502502

503503
export function formatShortTime(date: Date): string {
504-
const hours = date.getHours() % 12 || 12
505-
const minutes = (date.getMinutes() < 10 ? '0' : '') + date.getMinutes()
506-
return hours + ':' + minutes + (date.getHours() >= 12 ? 'pm' : 'am')
504+
return date.toLocaleTimeString([], { timeStyle: 'short' }).replace(' ', '').toLowerCase()
507505
}
508506

509507
export function formatShortDateTime(date: Date): string {

0 commit comments

Comments
 (0)