From 0187c4faff75e7eec1aed4d9b92ed3b3e9fb3d07 Mon Sep 17 00:00:00 2001 From: Philip Allgaier Date: Mon, 6 Sep 2021 10:22:46 +0200 Subject: [PATCH] Ensure calender follows time format locale (#9966) --- src/panels/calendar/ha-full-calendar.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/panels/calendar/ha-full-calendar.ts b/src/panels/calendar/ha-full-calendar.ts index e49443ea26..33e6d35480 100644 --- a/src/panels/calendar/ha-full-calendar.ts +++ b/src/panels/calendar/ha-full-calendar.ts @@ -23,6 +23,7 @@ import { } from "lit"; import { property, state } from "lit/decorators"; import memoize from "memoize-one"; +import { useAmPm } from "../../common/datetime/use_am_pm"; import { fireEvent } from "../../common/dom/fire_event"; import "../../components/ha-button-toggle-group"; import "../../components/ha-icon-button"; @@ -214,6 +215,11 @@ export class HAFullCalendar extends LitElement { ...defaultFullCalendarConfig, locale: this.hass.language, initialView: this.initialView, + eventTimeFormat: { + hour: useAmPm(this.hass.locale) ? "numeric" : "2-digit", + minute: useAmPm(this.hass.locale) ? "numeric" : "2-digit", + hour12: useAmPm(this.hass.locale), + }, }; config.dateClick = (info) => this._handleDateClick(info);