From 166acee1c6be5622e7f973b6fcca3ff83aa3be85 Mon Sep 17 00:00:00 2001
From: karwosts <32912880+karwosts@users.noreply.github.com>
Date: Tue, 29 Aug 2023 00:45:54 -0700
Subject: [PATCH] Fix language picker in profile displaying wrong language
 (#17725)

* fix language picker when changing language sort order #16642

* alternative fix
---
 src/components/ha-language-picker.ts | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/components/ha-language-picker.ts b/src/components/ha-language-picker.ts
index 5d1ece061b..7bc3300f5d 100644
--- a/src/components/ha-language-picker.ts
+++ b/src/components/ha-language-picker.ts
@@ -41,7 +41,18 @@ export class HaLanguagePicker extends LitElement {
 
   protected updated(changedProperties: PropertyValues) {
     super.updated(changedProperties);
-    if (changedProperties.has("languages") || changedProperties.has("value")) {
+
+    const localeChanged =
+      changedProperties.has("hass") &&
+      this.hass &&
+      changedProperties.get("hass") &&
+      changedProperties.get("hass").locale.language !==
+        this.hass.locale.language;
+    if (
+      changedProperties.has("languages") ||
+      changedProperties.has("value") ||
+      localeChanged
+    ) {
       this._select.layoutOptions();
       if (this._select.value !== this.value) {
         fireEvent(this, "value-changed", { value: this._select.value });
@@ -54,12 +65,15 @@ export class HaLanguagePicker extends LitElement {
         this.hass.locale,
         this.nativeName
       );
-      const selectedItem = languageOptions.find(
+      const selectedItemIndex = languageOptions.findIndex(
         (option) => option.value === this.value
       );
-      if (!selectedItem) {
+      if (selectedItemIndex === -1) {
         this.value = undefined;
       }
+      if (localeChanged) {
+        this._select.select(selectedItemIndex);
+      }
     }
   }