Update time macros

.HA_VERSION

@@ -1 +1 @@
-2025.5.3
+2025.6.1

custom_templates/easy_time.jinja

@@ -825,7 +825,21 @@
       'ottobre',
       'novembre',
       'dicembre',
-    ]
+    ],
+    'time_of_hour':{
+      0: '{hour}',
+      1: '{hour} e un minuto',
+      15: '{hour} ed un quarto',
+      30: '{hour} e mezzo',
+      45: '15 minuti alle {hour}',
+      59: 'un minuto alle {hour}',
+      'past_hour': '{hour} e {minute}',
+      'to_hour': '{hour} meno {minute}',
+    },
+    'time_of_day':{
+      'midnight': 'mezzanotte',
+      'noon': 'mezzogiorno',
+    }
   },
   'pt':{
     '_language': 'Português',
@@ -1041,7 +1055,21 @@
       'Październik',
       'Listopad',
       'Grudzień',
-    ]
+    ],
+    'time_of_hour': {
+      0: '{hour}',
+      1: 'minuta po {hour}',
+      15: 'kwadrans po {hour}',
+      30: 'pół godziny po {hour}',
+      45: 'za kwadrans {hour}',
+      59: 'za minutę {hour}',
+      'past_hour': '{minute} po {hour}',
+      'to_hour': '{minute} do {hour}'
+    },
+    'time_of_day': {
+      'midnight': 'północ',
+      'noon': 'południe'
+    }
   },
   'ru':{
     '_language': 'Русский',
@@ -1779,9 +1807,9 @@
   {%- else %}
     {%- set t = translate('ago', language=language) %}
     {%- if '%s' in t %}
-      {{ t % items }}
+      {{- t % items }}
     {%- else %}
-      {{- items }} {{ translate('ago', language=language) }}
+      {{- items }} {{ t }}
     {%- endif %}
   {%- endif %}
 {%- else %}
@@ -2045,7 +2073,7 @@
     {%- if '%s' in t %}
       {{- t % ret }}
     {%- else %}
-      {{- ret }} {{ translate('ago', language=language) }}
+      {{- ret }} {{ t }}
     {%- endif %}
   {%- endif %}
 {%- endif %}

custom_templates/relative_time_plus.jinja

@@ -236,7 +236,7 @@
       'hour': ['ч', 'час', 'часа', 'часов'],
       'minute': ['м', 'минута', 'минуты', 'минут'],
       'second': ['с', 'секунда', 'секунды', 'секунд'],
-      'millisecond': ['мс', 'милисекунда', 'милисекунды', 'милисекунд'],
+      'millisecond': ['мс', 'миллисекунда', 'миллисекунды', 'миллисекунд'],
       'combine': 'и',
       'error': 'Неверная дата',
     }
@@ -337,6 +337,22 @@
       'error': 'Érvénytelen dátum',
     }
   },
+  {
+    'language': 'tr',
+    'plural_form': 'english',
+    'phrases': {
+      'year': ['yıl', 'yıl', 'yıl'],
+      'month': ['ay', 'ay', 'ay'],
+      'week': ['hf', 'hafta', 'hafta'],
+      'day': ['gün', 'gün', 'gün'],
+      'hour': ['sa', 'saat', 'saat'],
+      'minute': ['dk', 'dakika', 'dakika'],
+      'second': ['sn', 'saniye', 'saniye'],
+      'millisecond': ['ms', 'milisaniye', 'milisaniye'],
+      'combine': 've',
+      'error': 'Geçersiz tarih',
+    }
+  },
 ] -%}
 
 {# macro to convert the abbreviated input for the not_use and always_show lists to the full time part names #}

packages/announcements.yaml

@@ -239,6 +239,9 @@ script:
   server_maintenance_annc:
     alias: Server Maintenance Announcement
     sequence:
+    - service: input_boolean.turn_on
+      target:
+        entity_id: input_boolean.server_maintenance
     - service: script.status_annc
       data:
         who: "{{ who|default('everywhere') }}"
@@ -248,6 +251,9 @@ script:
   server_maintenance_done_annc:
     alias: Server Maintenance Done Announcement
     sequence:
+    - service: input_boolean.turn_off
+      target:
+        entity_id: input_boolean.server_maintenance
     - service: script.status_annc
       data:
         who: "{{ who|default('everywhere') }}"

packages/scheduling.yaml

@@ -602,25 +602,15 @@ script:
               {% set low = states('sensor.overnight_lowest_temperature') | int %}
               {% set high = states('sensor.todays_high_temp') | int %}
               {% set kallen_bedtime = state_attr('input_datetime.kallen_bedtime','timestamp') | int %}
+              {% set kallen_fantime = state_attr('input_datetime.kallen_fan','timestamp') | int %}
+              {% set bedroom_hot = is_state('binary_sensor.kallen_bedroom_hot','on') %}
               {% set cutoff = 81000 %} {# Cutoff time is 22:30 #}
-              {% if is_state('binary_sensor.kallen_school_tomorrow','on') %}
+              {% if is_state('input_boolean.hot_day','on') or bedroom_hot == true %}
-                {% if is_state('input_boolean.hot_day','on') %}
+                {{ (kallen_fantime - 3600) | timestamp_custom('%H:%M',false) }}
-                  {{ (kallen_bedtime - 3600) | timestamp_custom('%H:%M',false) }}
+              {% elif low >= 56 or high >= 75 %}
-                {% elif low >= 56 or high >= 75 %}
+                {{ (kallen_bedtime - 1800) | timestamp_custom('%H:%M',false) }}
-                  {{ (kallen_bedtime - 1800) | timestamp_custom('%H:%M',false) }}
-                {% else %}
-                  {{ kallen_bedtime | timestamp_custom('%H:%M',false) }}
-                {% endif %}
-              {% elif low > 60 or high > 74 %}
-                {% if kallen_bedtime < cutoff %}
-                  {{ kallen_bedtime | timestamp_custom('%H:%M',false) }}
-                {% else %}
-                  22:00
-                {% endif %}
-              {% elif 56 <= low <= 60 %}
-                22:30
               {% else %}
-                00:00
+                {{ kallen_bedtime | timestamp_custom('%H:%M',false) }}
               {% endif %}
         - service: input_datetime.set_datetime
           entity_id: input_datetime.master_bedroom_fan

packages/sysmon.yaml

@@ -1,3 +1,8 @@
+input_boolean:
+  server_maintenance:
+    name: Server Maintenance
+    icon: mdi:wrench-clock
+
 input_select:
   log_level:
     name: Log Level