From 1aa6bd55777319ae2cc47c833e30c69d464d722a Mon Sep 17 00:00:00 2001
From: Allen Porter <allen@thebends.org>
Date: Sun, 4 Dec 2022 05:38:43 -0800
Subject: [PATCH] Fix recurrence rule generation for UNTIL rules (#14541)

---
 src/panels/calendar/dialog-calendar-event-editor.ts | 1 +
 src/panels/calendar/ha-recurrence-rule-editor.ts    | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/src/panels/calendar/dialog-calendar-event-editor.ts b/src/panels/calendar/dialog-calendar-event-editor.ts
index 790312570f..d673577df5 100644
--- a/src/panels/calendar/dialog-calendar-event-editor.ts
+++ b/src/panels/calendar/dialog-calendar-event-editor.ts
@@ -189,6 +189,7 @@ class DialogCalendarEventEditor extends LitElement {
           </div>
           <ha-recurrence-rule-editor
             .locale=${this.hass.locale}
+            .timezone=${this.hass.config.time_zone}
             .value=${this._rrule || ""}
             @value-changed=${this._handleRRuleChanged}
           >
diff --git a/src/panels/calendar/ha-recurrence-rule-editor.ts b/src/panels/calendar/ha-recurrence-rule-editor.ts
index b2c97a9aaa..08e239b62a 100644
--- a/src/panels/calendar/ha-recurrence-rule-editor.ts
+++ b/src/panels/calendar/ha-recurrence-rule-editor.ts
@@ -34,6 +34,8 @@ export class RecurrenceRuleEditor extends LitElement {
 
   @property({ attribute: false }) public locale!: HomeAssistant["locale"];
 
+  @property() public timezone?: string;
+
   @state() private _computedRRule = "";
 
   @state() private _freq?: RepeatFrequency = "none";
@@ -292,6 +294,7 @@ export class RecurrenceRuleEditor extends LitElement {
       byweekday: ruleByWeekDay(this._weekday),
       count: this._count,
       until: this._until,
+      tzid: this.timezone,
     };
     const contentline = RRule.optionsToString(options);
     return contentline.slice(6); // Strip "RRULE:" prefix