From e8e65a4293aff81401531bd0aa25ceb18cdad7f1 Mon Sep 17 00:00:00 2001
From: Darren Griffin <darren.griffin@live.co.uk>
Date: Fri, 28 Mar 2025 14:13:50 +0000
Subject: [PATCH] Fix default time_format option. Fixes #24798 (#24819)

* Fix default time_format option. Fixes #24798

* Update en.json

* Update src/translations/en.json

---------

Co-authored-by: Bram Kragten <mail@bramkragten.nl>
---
 .../editor/config-elements/hui-clock-card-editor.ts       | 8 ++++++--
 src/translations/en.json                                  | 1 +
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/panels/lovelace/editor/config-elements/hui-clock-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-clock-card-editor.ts
index cbfffc1784..83a140b553 100644
--- a/src/panels/lovelace/editor/config-elements/hui-clock-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-clock-card-editor.ts
@@ -72,7 +72,7 @@ export class HuiClockCardEditor
           selector: {
             select: {
               mode: "dropdown",
-              options: Object.values(TimeFormat).map((value) => ({
+              options: ["auto", ...Object.values(TimeFormat)].map((value) => ({
                 value,
                 label: localize(
                   `ui.panel.lovelace.editor.card.clock.time_formats.${value}`
@@ -86,7 +86,7 @@ export class HuiClockCardEditor
 
   private _data = memoizeOne((config) => ({
     clock_size: "small",
-    time_format: TimeFormat.language,
+    time_format: "auto",
     show_seconds: false,
     ...config,
   }));
@@ -113,6 +113,10 @@ export class HuiClockCardEditor
   }
 
   private _valueChanged(ev: CustomEvent): void {
+    if (ev.detail.value.time_format === "auto") {
+      delete ev.detail.value.time_format;
+    }
+
     fireEvent(this, "config-changed", { config: ev.detail.value });
   }
 
diff --git a/src/translations/en.json b/src/translations/en.json
index ac1e18c203..ddb3c37d37 100644
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -7163,6 +7163,7 @@
               "show_seconds": "Display seconds",
               "time_format": "Time format",
               "time_formats": {
+                "auto": "Use user settings",
                 "language": "[%key:ui::panel::profile::time_format::formats::language%]",
                 "system": "[%key:ui::panel::profile::time_format::formats::system%]",
                 "24": "[%key:ui::panel::profile::time_format::formats::24%]",