diff --git a/config/templates/speech/daily_briefing.yaml b/config/templates/speech/daily_briefing.yaml index 3b017cb..d66ff30 100755 --- a/config/templates/speech/daily_briefing.yaml +++ b/config/templates/speech/daily_briefing.yaml @@ -347,7 +347,7 @@ {% endif %} - {% if states.sensor.vacation_days2go.state | int < 32 %} + {% if states.sensor.vacation_days2go.state | int < 32 and states.sensor.vacation_days2go.state | int < 0 and states.sensor.vacation_days2go.state != 'unknown' %} {% if states.sensor.vacation_days2go.state | int > 1 %} There are {{ states.sensor.vacation_days2go.state }} days until {{ states.calendar.vacation.attributes.message }}! {% else %} @@ -437,7 +437,7 @@ {%- endif -%} {%- endif -%} - There are currently {{ (states.light | selectattr('state', 'eq', 'on') | list | count) | int + (states.switch | selectattr('state', 'eq', 'on') | list | count) | int }} lights + There are currently {{ (states.light | selectattr('state', 'eq', 'on') | list | count) | int + (states.switch | selectattr('state', 'eq', 'on') | list | count) | int }} lights and switches on.

@@ -485,11 +485,6 @@ {% endif %} - {{ [ - 'If you need anything else, just let me know.', - 'Let me know if you need anything else.' - ]|random }} - {%- endmacro -%} diff --git a/config/templates/speech/skylar_nightly_briefing.yaml b/config/templates/speech/skylar_nightly_briefing.yaml index 6fc9a2e..75f6c53 100755 --- a/config/templates/speech/skylar_nightly_briefing.yaml +++ b/config/templates/speech/skylar_nightly_briefing.yaml @@ -35,7 +35,7 @@ {% endif %} {% if states.sensor.school_start_days2go.state | int < 10 and states.sensor.school_start_days2go.state | int > 1 -%} {{ [ 'I hate to say it, but ', - 'Unforunately,', + 'Unfortunately,', 'All good things must come to an end.' ] | random }} There are only {{ states.sensor.school_start_days2go.state }} days