Extend TurnOn/Off for Light domain in Danish (#2978)

home-assistant · Feb 7, 2025 · 5910a85 · 5910a85
1 parent d9b4f11
commit 5910a85
Show file tree

Hide file tree

Showing 7 changed files with 216 additions and 26 deletions.
diff --git a/responses/da/HassTurnOff.yaml b/responses/da/HassTurnOff.yaml
@@ -2,8 +2,29 @@ language: da
 responses:
   intents:
     HassTurnOff:
-      default: "Slukkede {{ slots.name }}"
-      lights_area: "Slukkede lys i {{ slots.name }}"
+      default: >-
+        {% set translations = {
+          "button": "knappen",
+          "camera": "kameraet",
+          "input_button": "knappen",
+          "alarm_control_panel": "alarmen",
+          "automation": "automatiseringen",
+          "fan": "ventilatoren",
+          "climate": "termostaten",
+          "humidifier": "luftfugteren",
+          "input_boolean": "omskifteren",
+          "siren": "sirenen",
+          "water_heater": "vandvarmeren",
+          "light": "lyset",
+          "switch": "kontakten",
+          "remote": "fjernebetjeningen",
+          "vacuum": "støvsugeren",
+          "media_player": "medieafspilleren",
+          "lawn_mower": "plæneklipperen"
+        } %}
+        Slukkede {{ translations.get(state.domain, state.domain) }}
+      light_area: "Slukkede lyset"
+      light_all: "Slukkede alle lys"
       fans_area: "Slukkede blæsere i {{ slots.name }}"
       cover: "Lukkede {{ slots.name }}"
       cover_area: "Lukkede {{ slots.area}}"

diff --git a/responses/da/HassTurnOn.yaml b/responses/da/HassTurnOn.yaml
@@ -2,9 +2,28 @@ language: da
 responses:
   intents:
     HassTurnOn:
-      default: "Tændte {{ slots.name }}"
-      lights_area: "Tændte lys i {{ slots.area }}"
-      lights_floor: "Tændte lys på {{ slots.floor }}"
+      default: >-
+        {% set translations = {
+          "button": "knappen",
+          "camera": "kameraet",
+          "input_button": "knappen",
+          "alarm_control_panel": "alarmen",
+          "automation": "automatiseringen",
+          "fan": "ventilatoren",
+          "climate": "termostaten",
+          "humidifier": "luftfugteren",
+          "input_boolean": "omskifteren",
+          "siren": "sirenen",
+          "water_heater": "vandvarmeren",
+          "light": "lyset",
+          "switch": "kontakten",
+          "remote": "fjernebetjeningen",
+          "vacuum": "støvsugeren",
+          "media_player": "medieafspilleren",
+          "lawn_mower": "plæneklipperen"
+        } %}
+        Tændte {{ translations.get(state.domain, state.domain) }}
+      light_area: "Tændte lyset"
       light_all: "Tændte alle lys"
       fans_area: "Tændte blæsere i {{ slots.area }}"
       cover: "Åbnede {{ slots.name }}"

diff --git a/sentences/da/_common.yaml b/sentences/da/_common.yaml
@@ -353,9 +353,9 @@ lists:
     wildcard: true
 
 expansion_rules:
-  al: "(alle | alt | samtlige)"
+  al: "(al|alt|alle|samtlige)"
   blæser: "blæser[(e|en|ne)]"
-  etage: "{floor}[(n|en)]"
+  etage: "{floor}[(n|en)][s]"
   garagedør: "garage(dør|port)[(en|e|ene)]"
   gardin: "gardin[(et|er|erne)]"
   i_på: "(i | på)"

diff --git a/sentences/da/light_HassTurnOff.yaml b/sentences/da/light_HassTurnOff.yaml
@@ -2,9 +2,43 @@ language: da
 intents:
   HassTurnOff:
     data:
+      # Turn off a specific light
+      - sentences:
+          - "<sluk> [<lys>] <navn> [<i_på> <område>]"
+          - "<sluk> <område> <navn> [<lys>]"
+        requires_context:
+          domain: light
+
+      # Turn off all lights in an area
       - sentences:
           - "<sluk> [<al>] <lys> <i_på> <område>"
           - "<sluk> [<al>] <område> <lys>"
         slots:
           domain: light
-          name: all
+        response: light_area
+
+      # Turn off all lights on a floor
+      - sentences:
+          - "<sluk> [<al>] <lys> <i_på> <etage>"
+          - "<sluk> [<al>] <etage> <lys>"
+        slots:
+          domain: light
+        response: light_area
+
+      # Turn off all lights in the home
+      - sentences:
+          - "<sluk> <al> <lys> [overalt]"
+          - "<sluk> <lys> overalt"
+        slots:
+          domain: light
+        response: light_all
+
+      # Turn off lights in the same area as a satellite device
+      - sentences:
+          - "<sluk> [<al>] <lys> <her>"
+        slots:
+          domain: light
+        requires_context:
+          area:
+            slot: true
+        response: light_area
diff --git a/sentences/da/light_HassTurnOn.yaml b/sentences/da/light_HassTurnOn.yaml
@@ -2,30 +2,43 @@ language: da
 intents:
   HassTurnOn:
     data:
+      # Turn on a specific light
       - sentences:
-          - "<tænd> (<lys> <navn> <område> |<lys> <navn> [<i_på> <område>] | <navn> <område> | <navn> [<i_på> <område>])"
+          - "<tænd> [<lys>] <navn> [<i_på> <område>]"
+          - "<tænd> <område> <navn> [<lys>]"
         requires_context:
-          domain: "light"
+          domain: light
 
-      # Turn on all lights in a area
+      # Turn on all lights in an area
       - sentences:
           - "<tænd> [<al>] <lys> <i_på> <område>"
           - "<tænd> [<al>] <område> <lys>"
-        response: "lights_area"
         slots:
-          domain: "light"
+          domain: light
+        response: light_area
+
+      # Turn on all lights on a floor
+      - sentences:
+          - "<tænd> [<al>] <lys> <i_på> <etage>"
+          - "<tænd> [<al>] <etage> <lys>"
+        slots:
+          domain: light
+        response: light_area
 
       # Turn on all lights in the home
       - sentences:
-          - "<tænd> <al> <lys> overalt"
-          - "<tænd> <al> <lys>"
-        response: "light_all"
+          - "<tænd> <al> <lys> [overalt]"
+          - "<tænd> <lys> overalt"
         slots:
-          domain: "light"
+          domain: light
+        response: light_all
 
-      # Turn on all lights on a floor
+      # Turn on lights in the same area as a satellite device
       - sentences:
-          - "<tænd> [<al>] <lys> <i_på> <etage>"
-        response: "lights_floor"
+          - "<tænd> [<al>] <lys> <her>"
         slots:
-          domain: "light"
+          domain: light
+        requires_context:
+          area:
+            slot: true
+        response: light_area
diff --git a/tests/da/light_HassTurnOff.yaml b/tests/da/light_HassTurnOff.yaml
@@ -1,13 +1,25 @@
 language: da
 tests:
+  # Turn off a specific light
+  - sentences:
+      - "sluk for soveværelseslys"
+    intent:
+      name: HassTurnOff
+      slots:
+        name: "Soveværelseslys"
+      context:
+        domain: light
+    response: "Slukkede lyset"
+
+  # Turn off all lights in an area
   - sentences:
       - sluk lys i køkken
       - sluk lyset i køkkenet
       - sluk for lys i køkken
       - sluk for lyset i køkkenet
       - sluk alle lys i køkken
       - sluk for alt lyset i køkkenet
-      - sluk køkken lys
+      - sluk køkkenets lys
       - sluk køkken lyset
       - sluk alt køkken lyset
       - sluk for alle køkken lys
@@ -16,7 +28,8 @@ tests:
       slots:
         area: Køkken
         domain: light
-        name: all
+    response: "Slukkede lyset"
+
   - sentences:
       - sluk lys på badeværelse
       - sluk lyset på badeværelset
@@ -29,20 +42,58 @@ tests:
       slots:
         area: Badeværelse
         domain: light
-        name: all
+    response: "Slukkede lyset"
+
   - sentences:
       - sluk lyset i saunaen
     intent:
       name: HassTurnOff
       slots:
         area: Sauna
         domain: light
-        name: all
+    response: "Slukkede lyset"
+
   - sentences:
       - sluk lyset i stuen
     intent:
       name: HassTurnOff
       slots:
         area: Stue
         domain: light
-        name: all
+    response: "Slukkede lyset"
+
+  # Turn off all lights on a floor
+  - sentences:
+      - "sluk for alle lys i stueetagen"
+      - "sluk al stueetagens lys"
+    intent:
+      name: HassTurnOff
+      slots:
+        domain: light
+        floor: Stueetage
+    response: "Slukkede lyset"
+
+  # Turn off all lights in the home
+  - sentences:
+      - "sluk lyset overalt"
+      - "sluk alle lys"
+      - "sluk for lyset overalt"
+    intent:
+      name: HassTurnOff
+      slots:
+        domain: light
+    response: "Slukkede alle lys"
+
+  # Turn off lights in the same area as a satellite device
+  - sentences:
+      - "sluk lyset her"
+      - "sluk alle lys herinde"
+      - "sluk for lyset her"
+    intent:
+      name: HassTurnOff
+      context:
+        area: Stue
+      slots:
+        domain: light
+        area: Stue
+    response: "Slukkede lyset"
diff --git a/tests/da/light_HassTurnOn.yaml b/tests/da/light_HassTurnOn.yaml
@@ -1,5 +1,17 @@
 language: da
 tests:
+  # Turn on a specific light
+  - sentences:
+      - "tænd for soveværelseslys"
+    intent:
+      name: HassTurnOn
+      slots:
+        name: "Soveværelseslys"
+      context:
+        domain: light
+    response: "Tændte lyset"
+
+  # Turn on all lights in an area
   - sentences:
       - tænd lys i køkken
       - tænd lyset i køkkenet
@@ -16,6 +28,7 @@ tests:
       slots:
         area: Køkken
         domain: light
+    response: "Tændte lyset"
 
   - sentences:
       - tænd lys på badeværelse
@@ -29,6 +42,7 @@ tests:
       slots:
         area: Badeværelse
         domain: light
+    response: "Tændte lyset"
 
   - sentences:
       - tænd lyset i saunaen
@@ -37,6 +51,7 @@ tests:
       slots:
         area: Sauna
         domain: light
+    response: "Tændte lyset"
 
   - sentences:
       - tænd lyset i stuen
@@ -45,3 +60,40 @@ tests:
       slots:
         area: Stue
         domain: light
+    response: "Tændte lyset"
+
+  # Turn on all lights on a floor
+  - sentences:
+      - "tænd for alle lys i stueetagen"
+      - "tænd al stueetagens lys"
+    intent:
+      name: HassTurnOn
+      slots:
+        domain: light
+        floor: Stueetage
+    response: "Tændte lyset"
+
+  # Turn on all lights in the home
+  - sentences:
+      - "tænd lyset overalt"
+      - "tænd alle lys"
+      - "tænd for lyset overalt"
+    intent:
+      name: HassTurnOn
+      slots:
+        domain: light
+    response: "Tændte alle lys"
+
+  # Turn on lights in the same area as a satellite device
+  - sentences:
+      - "tænd lyset her"
+      - "tænd alle lys herinde"
+      - "tænd for lyset her"
+    intent:
+      name: HassTurnOn
+      context:
+        area: Stue
+      slots:
+        domain: light
+        area: Stue
+    response: "Tændte lyset"