From 117c2bcb1a04339e9869399cd4957e7dc2778a3c Mon Sep 17 00:00:00 2001 From: epenet <6771947+epenet@users.noreply.github.com> Date: Mon, 2 Jan 2023 10:39:42 +0000 Subject: [PATCH 1/4] Address late feedback to SFR Box --- homeassistant/components/sfr_box/sensor.py | 38 ++++++++++--------- homeassistant/components/sfr_box/strings.json | 28 ++++++++++++++ .../components/sfr_box/translations/en.json | 28 ++++++++++++++ 3 files changed, 76 insertions(+), 18 deletions(-) diff --git a/homeassistant/components/sfr_box/sensor.py b/homeassistant/components/sfr_box/sensor.py index a178e08d50824..c72734c852a3c 100644 --- a/homeassistant/components/sfr_box/sensor.py +++ b/homeassistant/components/sfr_box/sensor.py @@ -120,14 +120,15 @@ class SFRBoxSensorEntityDescription(SensorEntityDescription, SFRBoxSensorMixin): entity_category=EntityCategory.DIAGNOSTIC, entity_registry_enabled_default=False, options=[ - "No Defect", - "Of Frame", - "Loss Of Signal", - "Loss Of Power", - "Loss Of Signal Quality", - "Unknown", + "no defect", + "of frame", + "loss of signal", + "loss of power", + "loss of signal quality", + "unknown", ], - value_fn=lambda x: x.line_status, + translation_key="line_status", + value_fn=lambda x: x.line_status.lower(), ), SFRBoxSensorEntityDescription( key="training", @@ -136,18 +137,19 @@ class SFRBoxSensorEntityDescription(SensorEntityDescription, SFRBoxSensorMixin): entity_category=EntityCategory.DIAGNOSTIC, entity_registry_enabled_default=False, options=[ - "Idle", - "G.994 Training", - "G.992 Started", - "G.922 Channel Analysis", - "G.992 Message Exchange", - "G.993 Started", - "G.993 Channel Analysis", - "G.993 Message Exchange", - "Showtime", - "Unknown", + "idle", + "g.994 training", + "g.992 started", + "g.922 channel analysis", + "g.992 message exchange", + "g.993 started", + "g.993 channel analysis", + "g.993 message exchange", + "showtime", + "unknown", ], - value_fn=lambda x: x.training, + translation_key="training", + value_fn=lambda x: x.training.lower(), ), ) diff --git a/homeassistant/components/sfr_box/strings.json b/homeassistant/components/sfr_box/strings.json index 52d57eda8094b..780b773be2518 100644 --- a/homeassistant/components/sfr_box/strings.json +++ b/homeassistant/components/sfr_box/strings.json @@ -13,5 +13,33 @@ "abort": { "already_configured": "[%key:common::config_flow::abort::already_configured_device%]" } + }, + "entity": { + "sensor": { + "line_status": { + "state": { + "no defect": "No Defect", + "of frame": "Of Frame", + "loss of signal": "Loss Of Signal", + "loss of power": "Loss Of Power", + "loss of signal quality": "Loss Of Signal Quality", + "unknown": "Unknown" + } + }, + "training": { + "state": { + "idle": "Idle", + "g.994 training": "G.994 Training", + "g.992 started": "G.992 Started", + "g.922 channel analysis": "G.922 Channel Analysis", + "G.992 message exchange": "G.992 Message Exchange", + "g.993 started": "G.993 Started", + "g.993 channel analysis": "G.993 Channel Analysis", + "g.993 message exchange": "G.993 Message Exchange", + "showtime": "Showtime", + "unknown": "Unknown" + } + } + } } } diff --git a/homeassistant/components/sfr_box/translations/en.json b/homeassistant/components/sfr_box/translations/en.json index 0a4ba36e28532..dd19177f9714d 100644 --- a/homeassistant/components/sfr_box/translations/en.json +++ b/homeassistant/components/sfr_box/translations/en.json @@ -14,5 +14,33 @@ } } } + }, + "entity": { + "sensor": { + "line_status": { + "state": { + "no defect": "No Defect", + "of frame": "Of Frame", + "loss of signal": "Loss Of Signal", + "loss of power": "Loss Of Power", + "loss of signal quality": "Loss Of Signal Quality", + "unknown": "Unknown" + } + }, + "training": { + "state": { + "idle":"Idle", + "g.994 training":"G.994 Training", + "g.992 started":"G.992 Started", + "g.922 channel analysis":"G.922 Channel Analysis", + "G.992 message exchange":"G.992 Message Exchange", + "g.993 started":"G.993 Started", + "g.993 channel analysis":"G.993 Channel Analysis", + "g.993 message exchange":"G.993 Message Exchange", + "showtime":"Showtime", + "unknown":"Unknown" + } + } + } } } \ No newline at end of file From 157af37a1b728af1db2de49800550ffaa4567cac Mon Sep 17 00:00:00 2001 From: epenet <6771947+epenet@users.noreply.github.com> Date: Fri, 6 Jan 2023 08:30:27 +0000 Subject: [PATCH 2/4] Hassfest --- homeassistant/components/sfr_box/sensor.py | 28 +++++++++---------- homeassistant/components/sfr_box/strings.json | 24 ++++++++-------- .../components/sfr_box/translations/en.json | 24 ++++++++-------- 3 files changed, 38 insertions(+), 38 deletions(-) diff --git a/homeassistant/components/sfr_box/sensor.py b/homeassistant/components/sfr_box/sensor.py index c72734c852a3c..dcb173993a5cb 100644 --- a/homeassistant/components/sfr_box/sensor.py +++ b/homeassistant/components/sfr_box/sensor.py @@ -120,15 +120,15 @@ class SFRBoxSensorEntityDescription(SensorEntityDescription, SFRBoxSensorMixin): entity_category=EntityCategory.DIAGNOSTIC, entity_registry_enabled_default=False, options=[ - "no defect", - "of frame", - "loss of signal", - "loss of power", - "loss of signal quality", + "no-defect", + "of-frame", + "loss-of-signal", + "loss-of-power", + "loss-of-signal-quality", "unknown", ], translation_key="line_status", - value_fn=lambda x: x.line_status.lower(), + value_fn=lambda x: x.line_status.lower().replace(" ", "-"), ), SFRBoxSensorEntityDescription( key="training", @@ -138,18 +138,18 @@ class SFRBoxSensorEntityDescription(SensorEntityDescription, SFRBoxSensorMixin): entity_registry_enabled_default=False, options=[ "idle", - "g.994 training", - "g.992 started", - "g.922 channel analysis", - "g.992 message exchange", - "g.993 started", - "g.993 channel analysis", - "g.993 message exchange", + "g.994-training", + "g.992-started", + "g.922-channel-analysis", + "g.992-message-exchange", + "g.993-started", + "g.993-channel-analysis", + "g.993-message-exchange", "showtime", "unknown", ], translation_key="training", - value_fn=lambda x: x.training.lower(), + value_fn=lambda x: x.training.lower().replace(" ", "-"), ), ) diff --git a/homeassistant/components/sfr_box/strings.json b/homeassistant/components/sfr_box/strings.json index 780b773be2518..dc619bdb9305c 100644 --- a/homeassistant/components/sfr_box/strings.json +++ b/homeassistant/components/sfr_box/strings.json @@ -18,24 +18,24 @@ "sensor": { "line_status": { "state": { - "no defect": "No Defect", - "of frame": "Of Frame", - "loss of signal": "Loss Of Signal", - "loss of power": "Loss Of Power", - "loss of signal quality": "Loss Of Signal Quality", + "no-defect": "No Defect", + "of-frame": "Of Frame", + "loss-of-signal": "Loss Of Signal", + "loss-of-power": "Loss Of Power", + "loss-of-signal quality": "Loss Of Signal Quality", "unknown": "Unknown" } }, "training": { "state": { "idle": "Idle", - "g.994 training": "G.994 Training", - "g.992 started": "G.992 Started", - "g.922 channel analysis": "G.922 Channel Analysis", - "G.992 message exchange": "G.992 Message Exchange", - "g.993 started": "G.993 Started", - "g.993 channel analysis": "G.993 Channel Analysis", - "g.993 message exchange": "G.993 Message Exchange", + "g.994-training": "G.994 Training", + "g.992-started": "G.992 Started", + "g.922-channel-analysis": "G.922 Channel Analysis", + "G.992-message-exchange": "G.992 Message Exchange", + "g.993-started": "G.993 Started", + "g.993-channel-analysis": "G.993 Channel Analysis", + "g.993-message-exchange": "G.993 Message Exchange", "showtime": "Showtime", "unknown": "Unknown" } diff --git a/homeassistant/components/sfr_box/translations/en.json b/homeassistant/components/sfr_box/translations/en.json index dd19177f9714d..78a83685a4273 100644 --- a/homeassistant/components/sfr_box/translations/en.json +++ b/homeassistant/components/sfr_box/translations/en.json @@ -19,24 +19,24 @@ "sensor": { "line_status": { "state": { - "no defect": "No Defect", - "of frame": "Of Frame", - "loss of signal": "Loss Of Signal", - "loss of power": "Loss Of Power", - "loss of signal quality": "Loss Of Signal Quality", + "no-defect": "No Defect", + "of-frame": "Of Frame", + "loss-of-signal": "Loss Of Signal", + "loss-of-power": "Loss Of Power", + "loss-of-signal-quality": "Loss Of Signal Quality", "unknown": "Unknown" } }, "training": { "state": { "idle":"Idle", - "g.994 training":"G.994 Training", - "g.992 started":"G.992 Started", - "g.922 channel analysis":"G.922 Channel Analysis", - "G.992 message exchange":"G.992 Message Exchange", - "g.993 started":"G.993 Started", - "g.993 channel analysis":"G.993 Channel Analysis", - "g.993 message exchange":"G.993 Message Exchange", + "g.994-training":"G.994 Training", + "g.992-started":"G.992 Started", + "g.922-channel-analysis":"G.922 Channel Analysis", + "G.992-message-exchange":"G.992 Message Exchange", + "g.993-started":"G.993 Started", + "g.993-channel-analysis":"G.993 Channel Analysis", + "g.993-message-exchange":"G.993 Message Exchange", "showtime":"Showtime", "unknown":"Unknown" } From 35ac25020515171dfa56b1d9d8d69980e6fa7685 Mon Sep 17 00:00:00 2001 From: epenet <6771947+epenet@users.noreply.github.com> Date: Fri, 6 Jan 2023 08:33:34 +0000 Subject: [PATCH 3/4] missed a capital G --- homeassistant/components/sfr_box/strings.json | 2 +- homeassistant/components/sfr_box/translations/en.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/homeassistant/components/sfr_box/strings.json b/homeassistant/components/sfr_box/strings.json index dc619bdb9305c..bda8979fe8eed 100644 --- a/homeassistant/components/sfr_box/strings.json +++ b/homeassistant/components/sfr_box/strings.json @@ -32,7 +32,7 @@ "g.994-training": "G.994 Training", "g.992-started": "G.992 Started", "g.922-channel-analysis": "G.922 Channel Analysis", - "G.992-message-exchange": "G.992 Message Exchange", + "g.992-message-exchange": "G.992 Message Exchange", "g.993-started": "G.993 Started", "g.993-channel-analysis": "G.993 Channel Analysis", "g.993-message-exchange": "G.993 Message Exchange", diff --git a/homeassistant/components/sfr_box/translations/en.json b/homeassistant/components/sfr_box/translations/en.json index 78a83685a4273..6031ad1b2ac6f 100644 --- a/homeassistant/components/sfr_box/translations/en.json +++ b/homeassistant/components/sfr_box/translations/en.json @@ -33,7 +33,7 @@ "g.994-training":"G.994 Training", "g.992-started":"G.992 Started", "g.922-channel-analysis":"G.922 Channel Analysis", - "G.992-message-exchange":"G.992 Message Exchange", + "g.992-message-exchange":"G.992 Message Exchange", "g.993-started":"G.993 Started", "g.993-channel-analysis":"G.993 Channel Analysis", "g.993-message-exchange":"G.993 Message Exchange", From 57355a049fa4c9e5b8b003241f7de853d1e615c8 Mon Sep 17 00:00:00 2001 From: epenet <6771947+epenet@users.noreply.github.com> Date: Fri, 6 Jan 2023 08:45:48 +0000 Subject: [PATCH 4/4] Apply suggestion --- homeassistant/components/sfr_box/sensor.py | 28 +++++++++---------- homeassistant/components/sfr_box/strings.json | 24 ++++++++-------- .../components/sfr_box/translations/en.json | 24 ++++++++-------- 3 files changed, 38 insertions(+), 38 deletions(-) diff --git a/homeassistant/components/sfr_box/sensor.py b/homeassistant/components/sfr_box/sensor.py index dcb173993a5cb..2da8cbe55ef59 100644 --- a/homeassistant/components/sfr_box/sensor.py +++ b/homeassistant/components/sfr_box/sensor.py @@ -120,15 +120,15 @@ class SFRBoxSensorEntityDescription(SensorEntityDescription, SFRBoxSensorMixin): entity_category=EntityCategory.DIAGNOSTIC, entity_registry_enabled_default=False, options=[ - "no-defect", - "of-frame", - "loss-of-signal", - "loss-of-power", - "loss-of-signal-quality", + "no_defect", + "of_frame", + "loss_of_signal", + "loss_of_power", + "loss_of_signal_quality", "unknown", ], translation_key="line_status", - value_fn=lambda x: x.line_status.lower().replace(" ", "-"), + value_fn=lambda x: x.line_status.lower().replace(" ", "_"), ), SFRBoxSensorEntityDescription( key="training", @@ -138,18 +138,18 @@ class SFRBoxSensorEntityDescription(SensorEntityDescription, SFRBoxSensorMixin): entity_registry_enabled_default=False, options=[ "idle", - "g.994-training", - "g.992-started", - "g.922-channel-analysis", - "g.992-message-exchange", - "g.993-started", - "g.993-channel-analysis", - "g.993-message-exchange", + "g_994_training", + "g_992_started", + "g_922_channel_analysis", + "g_992_message_exchange", + "g_993_started", + "g_993_channel_analysis", + "g_993_message_exchange", "showtime", "unknown", ], translation_key="training", - value_fn=lambda x: x.training.lower().replace(" ", "-"), + value_fn=lambda x: x.training.lower().replace(" ", "_").replace(".", "_"), ), ) diff --git a/homeassistant/components/sfr_box/strings.json b/homeassistant/components/sfr_box/strings.json index bda8979fe8eed..c9b9f62bb332f 100644 --- a/homeassistant/components/sfr_box/strings.json +++ b/homeassistant/components/sfr_box/strings.json @@ -18,24 +18,24 @@ "sensor": { "line_status": { "state": { - "no-defect": "No Defect", - "of-frame": "Of Frame", - "loss-of-signal": "Loss Of Signal", - "loss-of-power": "Loss Of Power", - "loss-of-signal quality": "Loss Of Signal Quality", + "no_defect": "No Defect", + "of_frame": "Of Frame", + "loss_of_signal": "Loss Of Signal", + "loss_of_power": "Loss Of Power", + "loss_of_signal_quality": "Loss Of Signal Quality", "unknown": "Unknown" } }, "training": { "state": { "idle": "Idle", - "g.994-training": "G.994 Training", - "g.992-started": "G.992 Started", - "g.922-channel-analysis": "G.922 Channel Analysis", - "g.992-message-exchange": "G.992 Message Exchange", - "g.993-started": "G.993 Started", - "g.993-channel-analysis": "G.993 Channel Analysis", - "g.993-message-exchange": "G.993 Message Exchange", + "g_994_training": "G.994 Training", + "g_992_started": "G.992 Started", + "g_922_channel_analysis": "G.922 Channel Analysis", + "g_992_message_exchange": "G.992 Message Exchange", + "g_993_started": "G.993 Started", + "g_993_channel_analysis": "G.993 Channel Analysis", + "g_993_message_exchange": "G.993 Message Exchange", "showtime": "Showtime", "unknown": "Unknown" } diff --git a/homeassistant/components/sfr_box/translations/en.json b/homeassistant/components/sfr_box/translations/en.json index 6031ad1b2ac6f..69147ee4378ec 100644 --- a/homeassistant/components/sfr_box/translations/en.json +++ b/homeassistant/components/sfr_box/translations/en.json @@ -19,24 +19,24 @@ "sensor": { "line_status": { "state": { - "no-defect": "No Defect", - "of-frame": "Of Frame", - "loss-of-signal": "Loss Of Signal", - "loss-of-power": "Loss Of Power", - "loss-of-signal-quality": "Loss Of Signal Quality", + "no_defect": "No Defect", + "of_frame": "Of Frame", + "loss_of_signal": "Loss Of Signal", + "loss_of_power": "Loss Of Power", + "loss_of_signal_quality": "Loss Of Signal Quality", "unknown": "Unknown" } }, "training": { "state": { "idle":"Idle", - "g.994-training":"G.994 Training", - "g.992-started":"G.992 Started", - "g.922-channel-analysis":"G.922 Channel Analysis", - "g.992-message-exchange":"G.992 Message Exchange", - "g.993-started":"G.993 Started", - "g.993-channel-analysis":"G.993 Channel Analysis", - "g.993-message-exchange":"G.993 Message Exchange", + "g_994_training":"G.994 Training", + "g_992_started":"G.992 Started", + "g_922_channel_analysis":"G.922 Channel Analysis", + "g_992_message_exchange":"G.992 Message Exchange", + "g_993_started":"G.993 Started", + "g_993_channel_analysis":"G.993 Channel Analysis", + "g_993_message_exchange":"G.993 Message Exchange", "showtime":"Showtime", "unknown":"Unknown" }