Fix issue with calendar error for garbage collection

templates/speech/daily_briefing.yaml

@@ -385,6 +385,7 @@
       </p>
 
       <p>
+        {% if state_attr('calendar.garbage_collection','start_time') != none %}
           {% if count_the_days('calendar.garbage_collection','start_time') == 1 %}
             {% if state_attr('calendar.garbage_collection','message') == 'Large Garbage Pickup' %}
               Tomorrow is the monthly unlimited garbage pickup. Make sure to take out all regular trash, as well as any larger items that need to be disposed of.
@@ -394,6 +395,7 @@
           {% elif is_state('calendar.garbage_collection','on') %}
             Today is garbage day. Please make sure to wheel the garbage bin back to the house.
           {% endif %}
+        {% endif %}
       </p>
 
       <p>

templates/speech/morning_briefing.yaml

@@ -157,6 +157,7 @@
     </p>
 
     <p>
+      {% if state_attr('calendar.garbage_collection','start_time') != none %}
         {% if count_the_days('calendar.garbage_collection','start_time') == 1 %}
           {% if state_attr('calendar.garbage_collection','message') == 'Large Garbage Pickup' %}
             Tomorrow is the monthly unlimited garbage pickup. Make sure to take out all regular trash, as well as any larger items that need to be disposed of.
@@ -164,7 +165,8 @@
             Tomorrow is regular garbage pickup. Make sure that all trash cans are emptied and the outside bin has been wheeled to the curb.
           {% endif %}
         {% elif is_state('calendar.garbage_collection','on') %}
-        Today is garbage day. If the garbage has already been picked up at this time, please wheel the garbage bin back to the house.
+          Today is garbage day. Please make sure to wheel the garbage bin back to the house.
+        {% endif %}
       {% endif %}
     </p>
 

templates/speech/nightly_briefing.yaml

@@ -253,6 +253,7 @@
     </p>
 
     <p>
+      {% if state_attr('calendar.garbage_collection','start_time') != none %}
         {% if count_the_days('calendar.garbage_collection','start_time') == 1 %}
           {% if state_attr('calendar.garbage_collection','message') == 'Large Garbage Pickup' %}
             Tomorrow is the monthly unlimited garbage pickup. Make sure to take out all regular trash, as well as any larger items that need to be disposed of.
@@ -260,7 +261,8 @@
             Tomorrow is regular garbage pickup. Make sure that all trash cans are emptied and the outside bin has been wheeled to the curb.
           {% endif %}
         {% elif is_state('calendar.garbage_collection','on') %}
-          The garbage was picked up today. Please make sure to wheel the garbage bin back to the house if you have not already.
+          Today is garbage day. Please make sure to wheel the garbage bin back to the house.
+        {% endif %}
       {% endif %}
     </p>
 

templates/speech/welcome_home.yaml

@@ -156,6 +156,7 @@
     </p>
 
     <p>
+      {% if state_attr('calendar.garbage_collection','start_time') != none %}
         {% if count_the_days('calendar.garbage_collection','start_time') == 1 %}
           {% if state_attr('calendar.garbage_collection','message') == 'Large Garbage Pickup' %}
             Tomorrow is the monthly unlimited garbage pickup. Make sure to take out all regular trash, as well as any larger items that need to be disposed of.
@@ -163,7 +164,8 @@
             Tomorrow is regular garbage pickup. Make sure that all trash cans are emptied and the outside bin has been wheeled to the curb.
           {% endif %}
         {% elif is_state('calendar.garbage_collection','on') %}
-        Today is garbage day. If the garbage has already been picked up, please wheel the garbage bin back to the house.
+          Today is garbage day. Please make sure to wheel the garbage bin back to the house.
+        {% endif %}
       {% endif %}
     </p>