From e002c84eba44e095ad8dbe3b2e2de0db2b765cf4 Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Wed, 22 Apr 2020 06:05:39 -0700 Subject: [PATCH] Don't set step title if it's integration title (#34524) --- homeassistant/components/adguard/strings.json | 1 - homeassistant/components/brother/strings.json | 1 - homeassistant/components/cast/strings.json | 1 - homeassistant/components/deconz/strings.json | 2 -- homeassistant/components/directv/strings.json | 4 +--- homeassistant/components/elgato/strings.json | 1 - homeassistant/components/esphome/strings.json | 6 ++---- homeassistant/components/fritzbox/strings.json | 12 +++++------- .../components/hisense_aehw4a1/strings.json | 1 - homeassistant/components/ios/strings.json | 1 - homeassistant/components/izone/strings.json | 1 - homeassistant/components/konnected/strings.json | 1 - homeassistant/components/lifx/strings.json | 1 - homeassistant/components/mobile_app/strings.json | 1 - homeassistant/components/mqtt/strings.json | 1 - homeassistant/components/roku/strings.json | 1 - homeassistant/components/samsungtv/strings.json | 1 - homeassistant/components/sonos/strings.json | 1 - homeassistant/components/tplink/strings.json | 1 - homeassistant/components/upnp/strings.json | 4 +--- homeassistant/components/wemo/strings.json | 1 - homeassistant/components/wled/strings.json | 1 - script/hassfest/translations.py | 2 +- script/scaffold/generate.py | 5 +---- 24 files changed, 11 insertions(+), 41 deletions(-) diff --git a/homeassistant/components/adguard/strings.json b/homeassistant/components/adguard/strings.json index bf079e4c593..471708879b4 100644 --- a/homeassistant/components/adguard/strings.json +++ b/homeassistant/components/adguard/strings.json @@ -2,7 +2,6 @@ "config": { "step": { "user": { - "title": "Link your AdGuard Home.", "description": "Set up your AdGuard Home instance to allow monitoring and control.", "data": { "host": "Host", diff --git a/homeassistant/components/brother/strings.json b/homeassistant/components/brother/strings.json index 12b309b740e..76e62731e53 100644 --- a/homeassistant/components/brother/strings.json +++ b/homeassistant/components/brother/strings.json @@ -3,7 +3,6 @@ "flow_title": "Brother Printer: {model} {serial_number}", "step": { "user": { - "title": "Brother Printer", "description": "Set up Brother printer integration. If you have problems with configuration go to: https://www.home-assistant.io/integrations/brother", "data": { "host": "Printer hostname or IP address", diff --git a/homeassistant/components/cast/strings.json b/homeassistant/components/cast/strings.json index c7de86ba63c..aed62243f31 100644 --- a/homeassistant/components/cast/strings.json +++ b/homeassistant/components/cast/strings.json @@ -2,7 +2,6 @@ "config": { "step": { "confirm": { - "title": "Google Cast", "description": "Do you want to set up Google Cast?" } }, diff --git a/homeassistant/components/deconz/strings.json b/homeassistant/components/deconz/strings.json index 7b8da3ee81a..2042c36c859 100644 --- a/homeassistant/components/deconz/strings.json +++ b/homeassistant/components/deconz/strings.json @@ -3,13 +3,11 @@ "flow_title": "deCONZ Zigbee gateway ({host})", "step": { "user": { - "title": "Select deCONZ gateway", "data": { "host": "Select discovered deCONZ gateway" } }, "manual_input": { - "title": "Configure deCONZ gateway", "data": { "host": "Host", "port": "Port" diff --git a/homeassistant/components/directv/strings.json b/homeassistant/components/directv/strings.json index 606a2f0f0c9..24b97165513 100644 --- a/homeassistant/components/directv/strings.json +++ b/homeassistant/components/directv/strings.json @@ -4,11 +4,9 @@ "step": { "ssdp_confirm": { "data": {}, - "description": "Do you want to set up {name}?", - "title": "Connect to the DirecTV receiver" + "description": "Do you want to set up {name}?" }, "user": { - "title": "Connect to the DirecTV receiver", "data": { "host": "Host or IP address" } } }, diff --git a/homeassistant/components/elgato/strings.json b/homeassistant/components/elgato/strings.json index bae8b6ff064..f2123731412 100644 --- a/homeassistant/components/elgato/strings.json +++ b/homeassistant/components/elgato/strings.json @@ -3,7 +3,6 @@ "flow_title": "Elgato Key Light: {serial_number}", "step": { "user": { - "title": "Link your Elgato Key Light", "description": "Set up your Elgato Key Light to integrate with Home Assistant.", "data": { "host": "Host or IP address", "port": "Port number" } }, diff --git a/homeassistant/components/esphome/strings.json b/homeassistant/components/esphome/strings.json index 48b72d0de0b..0c2f0fee8d9 100644 --- a/homeassistant/components/esphome/strings.json +++ b/homeassistant/components/esphome/strings.json @@ -9,13 +9,11 @@ "step": { "user": { "data": { "host": "Host", "port": "Port" }, - "description": "Please enter connection settings of your [ESPHome](https://esphomelib.com/) node.", - "title": "ESPHome" + "description": "Please enter connection settings of your [ESPHome](https://esphomelib.com/) node." }, "authenticate": { "data": { "password": "Password" }, - "description": "Please enter the password you set in your configuration for {name}.", - "title": "Enter Password" + "description": "Please enter the password you set in your configuration for {name}." }, "discovery_confirm": { "description": "Do you want to add the ESPHome node `{name}` to Home Assistant?", diff --git a/homeassistant/components/fritzbox/strings.json b/homeassistant/components/fritzbox/strings.json index 719e5344289..4cb5b7bcdcc 100644 --- a/homeassistant/components/fritzbox/strings.json +++ b/homeassistant/components/fritzbox/strings.json @@ -3,20 +3,18 @@ "flow_title": "AVM FRITZ!Box: {name}", "step": { "user": { - "title": "AVM FRITZ!Box", "description": "Enter your AVM FRITZ!Box information.", "data": { - "host": "Host or IP address", - "username": "Username", - "password": "Password" + "host": "Host or IP address", + "username": "Username", + "password": "Password" } }, "confirm": { - "title": "AVM FRITZ!Box", "description": "Do you want to set up {name}?", "data": { - "username": "Username", - "password": "Password" + "username": "Username", + "password": "Password" } } }, diff --git a/homeassistant/components/hisense_aehw4a1/strings.json b/homeassistant/components/hisense_aehw4a1/strings.json index 47d8bce7e73..5d9b6f1ef96 100644 --- a/homeassistant/components/hisense_aehw4a1/strings.json +++ b/homeassistant/components/hisense_aehw4a1/strings.json @@ -2,7 +2,6 @@ "config": { "step": { "confirm": { - "title": "Hisense AEH-W4A1", "description": "Do you want to set up Hisense AEH-W4A1?" } }, diff --git a/homeassistant/components/ios/strings.json b/homeassistant/components/ios/strings.json index 0029ad0688c..b09bd4a777f 100644 --- a/homeassistant/components/ios/strings.json +++ b/homeassistant/components/ios/strings.json @@ -2,7 +2,6 @@ "config": { "step": { "confirm": { - "title": "Home Assistant iOS", "description": "Do you want to set up the Home Assistant iOS component?" } }, diff --git a/homeassistant/components/izone/strings.json b/homeassistant/components/izone/strings.json index 78512dba772..9772bd4c93c 100644 --- a/homeassistant/components/izone/strings.json +++ b/homeassistant/components/izone/strings.json @@ -2,7 +2,6 @@ "config": { "step": { "confirm": { - "title": "iZone", "description": "Do you want to set up iZone?" } }, diff --git a/homeassistant/components/konnected/strings.json b/homeassistant/components/konnected/strings.json index 60ab4cac7c4..4c87cb0bff6 100644 --- a/homeassistant/components/konnected/strings.json +++ b/homeassistant/components/konnected/strings.json @@ -6,7 +6,6 @@ "description": "A Konnected Alarm Panel with ID {id} has been discovered in configuration.yaml. This flow will allow you to import it into a config entry." }, "user": { - "title": "Discover Konnected Device", "description": "Please enter the host information for your Konnected Panel.", "data": { "host": "Konnected device IP address", diff --git a/homeassistant/components/lifx/strings.json b/homeassistant/components/lifx/strings.json index 663ba3a6680..c35dcf3eb26 100644 --- a/homeassistant/components/lifx/strings.json +++ b/homeassistant/components/lifx/strings.json @@ -2,7 +2,6 @@ "config": { "step": { "confirm": { - "title": "LIFX", "description": "Do you want to set up LIFX?" } }, diff --git a/homeassistant/components/mobile_app/strings.json b/homeassistant/components/mobile_app/strings.json index c7b3aec27f8..fd1cddbcb5f 100644 --- a/homeassistant/components/mobile_app/strings.json +++ b/homeassistant/components/mobile_app/strings.json @@ -2,7 +2,6 @@ "config": { "step": { "confirm": { - "title": "Mobile App", "description": "Do you want to set up the Mobile App component?" } }, diff --git a/homeassistant/components/mqtt/strings.json b/homeassistant/components/mqtt/strings.json index b182dc6b8b3..08a1500975a 100644 --- a/homeassistant/components/mqtt/strings.json +++ b/homeassistant/components/mqtt/strings.json @@ -2,7 +2,6 @@ "config": { "step": { "broker": { - "title": "MQTT", "description": "Please enter the connection information of your MQTT broker.", "data": { "broker": "Broker", diff --git a/homeassistant/components/roku/strings.json b/homeassistant/components/roku/strings.json index 7d187994a24..bc73623ae31 100644 --- a/homeassistant/components/roku/strings.json +++ b/homeassistant/components/roku/strings.json @@ -3,7 +3,6 @@ "flow_title": "Roku: {name}", "step": { "user": { - "title": "Roku", "description": "Enter your Roku information.", "data": { "host": "Host or IP address" } }, diff --git a/homeassistant/components/samsungtv/strings.json b/homeassistant/components/samsungtv/strings.json index 36081fe967f..4377e0671e9 100644 --- a/homeassistant/components/samsungtv/strings.json +++ b/homeassistant/components/samsungtv/strings.json @@ -3,7 +3,6 @@ "flow_title": "Samsung TV: {model}", "step": { "user": { - "title": "Samsung TV", "description": "Enter your Samsung TV information. If you never connected Home Assistant before you should see a popup on your TV asking for authorization.", "data": { "host": "Host or IP address", "name": "Name" } }, diff --git a/homeassistant/components/sonos/strings.json b/homeassistant/components/sonos/strings.json index b20ed95b410..22414453af9 100644 --- a/homeassistant/components/sonos/strings.json +++ b/homeassistant/components/sonos/strings.json @@ -2,7 +2,6 @@ "config": { "step": { "confirm": { - "title": "Sonos", "description": "Do you want to set up Sonos?" } }, diff --git a/homeassistant/components/tplink/strings.json b/homeassistant/components/tplink/strings.json index f462f411bf7..cbb89653607 100644 --- a/homeassistant/components/tplink/strings.json +++ b/homeassistant/components/tplink/strings.json @@ -2,7 +2,6 @@ "config": { "step": { "confirm": { - "title": "TP-Link Smart Home", "description": "Do you want to setup TP-Link smart devices?" } }, diff --git a/homeassistant/components/upnp/strings.json b/homeassistant/components/upnp/strings.json index 8c1c3fa237e..5ad90b2c0cb 100644 --- a/homeassistant/components/upnp/strings.json +++ b/homeassistant/components/upnp/strings.json @@ -1,13 +1,11 @@ { "config": { "step": { - "init": { "title": "UPnP/IGD" }, "confirm": { - "title": "UPnP/IGD", "description": "Do you want to set up UPnP/IGD?" }, "user": { - "title": "Configuration options for the UPnP/IGD", + "title": "Configuration options", "data": { "enable_port_mapping": "Enable port mapping for Home Assistant", "enable_sensors": "Add traffic sensors", diff --git a/homeassistant/components/wemo/strings.json b/homeassistant/components/wemo/strings.json index 41138029e60..fe8cc10a74c 100644 --- a/homeassistant/components/wemo/strings.json +++ b/homeassistant/components/wemo/strings.json @@ -2,7 +2,6 @@ "config": { "step": { "confirm": { - "title": "Wemo", "description": "Do you want to set up Wemo?" } }, diff --git a/homeassistant/components/wled/strings.json b/homeassistant/components/wled/strings.json index 3900d0cb5f0..4200fd96301 100644 --- a/homeassistant/components/wled/strings.json +++ b/homeassistant/components/wled/strings.json @@ -3,7 +3,6 @@ "flow_title": "WLED: {name}", "step": { "user": { - "title": "Link your WLED", "description": "Set up your WLED to integrate with Home Assistant.", "data": { "host": "Host or IP address" } }, diff --git a/script/hassfest/translations.py b/script/hassfest/translations.py index 1e49530e275..1c6f673995e 100644 --- a/script/hassfest/translations.py +++ b/script/hassfest/translations.py @@ -121,7 +121,7 @@ def gen_strings_schema(config: Config, integration: Integration): config=config, integration=integration, flow_title=REMOVED, - require_step_title=True, + require_step_title=False, ), vol.Optional("options"): gen_data_entry_schema( config=config, diff --git a/script/scaffold/generate.py b/script/scaffold/generate.py index 8c3b2e9aeb8..4317618ed52 100644 --- a/script/scaffold/generate.py +++ b/script/scaffold/generate.py @@ -133,10 +133,7 @@ def _custom_tasks(template, info) -> None: title=info.name, config={ "step": { - "confirm": { - "title": info.name, - "description": f"Do you want to set up {info.name}?", - } + "confirm": {"description": f"Do you want to set up {info.name}?"} }, "abort": { "single_instance_allowed": f"Only a single configuration of {info.name} is possible.",