From ec4f9e98a9d1e76ce7a9c225c50478c3b03499f9 Mon Sep 17 00:00:00 2001 From: LKuemmel Date: Fri, 5 Dec 2025 14:28:08 +0100 Subject: [PATCH] scheduled charging: improve text for loading hours --- packages/control/ev/charge_template.py | 29 ++++++++++++++------------ 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/packages/control/ev/charge_template.py b/packages/control/ev/charge_template.py index 9ed37d4638..2fdf036ae8 100644 --- a/packages/control/ev/charge_template.py +++ b/packages/control/ev/charge_template.py @@ -618,19 +618,22 @@ def convert_loading_hours_to_string(hour_list: List[int]) -> str: loading_times_tomorrow = [datetime.datetime.fromtimestamp(hour) for hour in sorted(hour_list) if hour > midnight] - loading_message = "Geladen wird "+("jetzt" - if is_loading_hour(hour_list) - else '') - loading_message += ((" und " if is_loading_hour(hour_list) else "") + - f"heute {convert_loading_hours_to_string(loading_times_today)}" - if 0 < len(loading_times_today) - else '') - loading_message += (" sowie " - if 0 < len(loading_times_tomorrow) - else '') - loading_message += (f"morgen {convert_loading_hours_to_string(loading_times_tomorrow)}" - if 0 < len(loading_times_tomorrow) - else '') + parts = [] + + if is_loading_hour(hour_list): + parts.append("jetzt") + + if 0 < len(loading_times_today): + if parts: + parts.append(" und ") + parts.append(f"heute {convert_loading_hours_to_string(loading_times_today)}") + + if 0 < len(loading_times_tomorrow): + if parts: + parts.append(" sowie ") + parts.append(f"morgen {convert_loading_hours_to_string(loading_times_tomorrow)}") + + loading_message = "Geladen wird " + "".join(parts) return loading_message + '.' hour_list = data.data.optional_data.ep_get_loading_hours(