From 625da46da9dc325db779dd39de03ea5b7a3ad634 Mon Sep 17 00:00:00 2001
From: Bram Kragten <mail@bramkragten.nl>
Date: Wed, 28 Jun 2023 15:50:43 +0200
Subject: [PATCH] Fix assist devtools default language (#17071)

---
 .../developer-tools/assist/developer-tools-assist.ts  | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/panels/developer-tools/assist/developer-tools-assist.ts b/src/panels/developer-tools/assist/developer-tools-assist.ts
index 89e3890f5c..6cc8470dfb 100644
--- a/src/panels/developer-tools/assist/developer-tools-assist.ts
+++ b/src/panels/developer-tools/assist/developer-tools-assist.ts
@@ -90,6 +90,15 @@ class HaPanelDevAssist extends SubscribeMixin(LitElement) {
       assistAgent?.supported_languages === "*"
         ? undefined
         : assistAgent?.supported_languages;
+
+    if (
+      !this._language &&
+      this.supportedLanguages?.includes(this.hass.locale.language)
+    ) {
+      this._language = this.hass.locale.language;
+    } else if (!this._language) {
+      this._language = "en";
+    }
   }
 
   protected firstUpdated(): void {
@@ -111,7 +120,7 @@ class HaPanelDevAssist extends SubscribeMixin(LitElement) {
                   <ha-language-picker
                     .languages=${this.supportedLanguages}
                     .hass=${this.hass}
-                    .value=${this._language ?? "en"}
+                    .value=${this._language}
                     @value-changed=${this._languageChanged}
                   ></ha-language-picker>
                 `