[EN] Allow - in timer durations (#3549)

* Allow - in timer durations

* Adjust versions

Author: synesthesiam

.github/workflows/ci.yaml

@@ -25,7 +25,7 @@ jobs:
       - uses: actions/checkout@v5
       - uses: actions/setup-python@v6
         with:
-          python-version: "3.12"
+          python-version: "3.13"
           cache: "pip"
       - run: script/setup
       - run: python3 -m script.intentfest add_language test_add_language_generates_valid_data "CI Added Language"

requirements.txt

@@ -1,4 +1,4 @@
-hassil==3.3.0
+hassil==3.4.0
 PyYAML==6.0.3
 voluptuous==0.15.2
 regex==2025.10.23

sentences/en/_common.yaml

@@ -444,14 +444,14 @@ expansion_rules:
   # Timers
   timer_set: "(start|set|create)"
   timer_cancel: "(cancel|stop)"
-  timer_duration_seconds: "{timer_seconds:seconds} second[s]"
-  timer_duration_minutes: "({timer_minutes:minutes} minute[s] [[and] {timer_seconds:seconds} second[s]])|({timer_minutes:minutes} and [a] {timer_half:seconds} minute[s])|({timer_half:seconds} a minute[s])"
-  timer_duration_hours: "({timer_hours:hours} hour[s] [[and] {timer_minutes:minutes} minute[s]] [[and] {timer_seconds:seconds} second[s]])|({timer_hours:hours} and [a] {timer_half:minutes} hour[s])|({timer_half:minutes} an hour[s])"
+  timer_duration_seconds: "{timer_seconds:seconds}( |-)second[s]"
+  timer_duration_minutes: "({timer_minutes:minutes}( |-)minute[s] [[and] {timer_seconds:seconds}( |-)second[s]])|({timer_minutes:minutes} and [a] {timer_half:seconds} minute[s])|({timer_half:seconds} a minute[s])"
+  timer_duration_hours: "({timer_hours:hours}( |-)hour[s] [[and] {timer_minutes:minutes}( |-)minute[s]] [[and] {timer_seconds:seconds}( |-)second[s]])|({timer_hours:hours} and [a] {timer_half:minutes} hour[s])|({timer_half:minutes} an hour[s])"
   timer_duration: "<timer_duration_seconds>|<timer_duration_minutes>|<timer_duration_hours>"
 
-  timer_start_seconds: "{timer_seconds:start_seconds} second[s]"
-  timer_start_minutes: "{timer_minutes:start_minutes} minute[s] [[and] {timer_seconds:start_seconds} second[s]]"
-  timer_start_hours: "{timer_hours:start_hours} hour[s] [[and] {timer_minutes:start_minutes} minute[s]] [[and] {timer_seconds:start_seconds} second[s]]"
+  timer_start_seconds: "{timer_seconds:start_seconds}( |-)second[s]"
+  timer_start_minutes: "{timer_minutes:start_minutes}( |-)minute[s] [[and] {timer_seconds:start_seconds}( |-)second[s]]"
+  timer_start_hours: "{timer_hours:start_hours}( |-)hour[s] [[and] {timer_minutes:start_minutes}( |-)minute[s]] [[and] {timer_seconds:start_seconds}( |-)second[s]]"
   timer_start: "<timer_start_seconds>|<timer_start_minutes>|<timer_start_hours>"
 
   # Fans

tests/en/homeassistant_HassCancelTimer.yaml

@@ -11,6 +11,7 @@ tests:
 
   - sentences:
       - "cancel 5 minute timer"
+      - "cancel 5-minute timer"
       - "stop timer for 5 minutes"
       - "stop 5 minute timer"
     intent:

tests/en/homeassistant_HassDecreaseTimer.yaml

@@ -14,6 +14,7 @@ tests:
 
   - sentences:
       - "remove 5 minutes from 1 hour timer"
+      - "remove 5 minutes from 1-hour timer"
       - "remove 5 minutes from timer for 1 hour"
       - "take 5 minutes off 1 hour timer"
       - "take 5 minutes from 1 hour timer"

tests/en/homeassistant_HassIncreaseTimer.yaml

@@ -12,6 +12,7 @@ tests:
 
   - sentences:
       - "add 5 minutes to 1 hour timer"
+      - "add 5 minutes to 1-hour timer"
       - "add 5 minutes to timer for 1 hour"
       - "increase 1 hour timer by 5 minutes"
       - "increase timer for 1 hour by 5 minutes"

tests/en/homeassistant_HassPauseTimer.yaml

@@ -10,6 +10,7 @@ tests:
 
   - sentences:
       - "pause 1 hour timer"
+      - "pause 1-hour timer"
       - "pause timer for 1 hour"
     intent:
       name: HassPauseTimer

tests/en/homeassistant_HassStartTimer.yaml

@@ -3,6 +3,7 @@ language: en
 tests:
   - sentences:
       - "10 minute timer"
+      - "10-minute timer"
     intent:
       name: HassStartTimer
       slots:
@@ -11,6 +12,7 @@ tests:
 
   - sentences:
       - "start a 1 hour timer"
+      - "start a 1-hour timer"
       - "set timer for 1 hour"
       - "create 1 hour timer"
       - "1 hour timer"

tests/en/homeassistant_HassTimerStatus.yaml

@@ -13,6 +13,7 @@ tests:
 
   - sentences:
       - "status of 1 hour timer"
+      - "status of 1-hour timer"
       - "1 hour timer status"
       - "time left on the 1 hour timer"
       - "how long is left on my 1 hour timer"

tests/en/homeassistant_HassUnpauseTimer.yaml

@@ -10,6 +10,7 @@ tests:
 
   - sentences:
       - "resume 1 hour timer"
+      - "resume 1-hour timer"
       - "continue timer for 1 hour"
     intent:
       name: HassUnpauseTimer