From c0314cd05c53401ad80d12ca667ea6937645cac2 Mon Sep 17 00:00:00 2001
From: G Johansson <goran.johansson@shiftit.se>
Date: Mon, 11 Dec 2023 14:06:29 +0100
Subject: [PATCH] Make Workday UI setup nicer (#105407)

---
 homeassistant/components/workday/config_flow.py | 16 ++++++++--------
 homeassistant/components/workday/strings.json   | 10 +++++-----
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/homeassistant/components/workday/config_flow.py b/homeassistant/components/workday/config_flow.py
index 348bb0c2fba..9ae31977276 100644
--- a/homeassistant/components/workday/config_flow.py
+++ b/homeassistant/components/workday/config_flow.py
@@ -155,6 +155,14 @@ DATA_SCHEMA_SETUP = vol.Schema(
 
 DATA_SCHEMA_OPT = vol.Schema(
     {
+        vol.Optional(CONF_WORKDAYS, default=DEFAULT_WORKDAYS): SelectSelector(
+            SelectSelectorConfig(
+                options=ALLOWED_DAYS,
+                multiple=True,
+                mode=SelectSelectorMode.DROPDOWN,
+                translation_key="days",
+            )
+        ),
         vol.Optional(CONF_EXCLUDES, default=DEFAULT_EXCLUDES): SelectSelector(
             SelectSelectorConfig(
                 options=ALLOWED_DAYS,
@@ -166,14 +174,6 @@ DATA_SCHEMA_OPT = vol.Schema(
         vol.Optional(CONF_OFFSET, default=DEFAULT_OFFSET): NumberSelector(
             NumberSelectorConfig(min=-10, max=10, step=1, mode=NumberSelectorMode.BOX)
         ),
-        vol.Optional(CONF_WORKDAYS, default=DEFAULT_WORKDAYS): SelectSelector(
-            SelectSelectorConfig(
-                options=ALLOWED_DAYS,
-                multiple=True,
-                mode=SelectSelectorMode.DROPDOWN,
-                translation_key="days",
-            )
-        ),
         vol.Optional(CONF_ADD_HOLIDAYS, default=[]): SelectSelector(
             SelectSelectorConfig(
                 options=[],
diff --git a/homeassistant/components/workday/strings.json b/homeassistant/components/workday/strings.json
index 20e7cd26fd6..7e8439af5ea 100644
--- a/homeassistant/components/workday/strings.json
+++ b/homeassistant/components/workday/strings.json
@@ -23,13 +23,13 @@
           "language": "Language for named holidays"
         },
         "data_description": {
-          "excludes": "List of workdays to exclude",
-          "days_offset": "Days offset",
-          "workdays": "List of workdays",
+          "excludes": "List of workdays to exclude, notice the keyword `holiday` and read the documentation on how to use it correctly",
+          "days_offset": "Days offset from current day",
+          "workdays": "List of working days",
           "add_holidays": "Add custom holidays as YYYY-MM-DD or as range using `,` as separator",
           "remove_holidays": "Remove holidays as YYYY-MM-DD, as range using `,` as separator or by using partial of name",
-          "province": "State, Territory, Province, Region of Country",
-          "language": "Choose the language you want to configure named holidays after"
+          "province": "State, territory, province or region of country",
+          "language": "Language to use when configuring named holiday exclusions"
         }
       }
     },