Replace climate-control device with thermostat in climate translations

homeassistant/components/automation/__init__.py

@@ -127,7 +127,6 @@ _EXPERIMENTAL_CONDITION_PLATFORMS = {
     "assist_satellite",
     "fan",
     "light",
-    "lock",
     "siren",
 }
 

homeassistant/components/climate/strings.json

@@ -1,6 +1,6 @@
 {
   "common": {
-    "trigger_behavior_description": "The behavior of the targeted climates to trigger on.",
+    "trigger_behavior_description": "The behavior of the targeted thermostats to trigger on.",
     "trigger_behavior_name": "Behavior"
   },
   "device_automation": {
@@ -298,22 +298,22 @@
       "name": "Set target temperature"
     },
     "toggle": {
-      "description": "Toggles climate device, from on to off, or off to on.",
+      "description": "Toggles thermostat, from on to off, or off to on.",
       "name": "[%key:common::action::toggle%]"
     },
     "turn_off": {
-      "description": "Turns climate device off.",
+      "description": "Turns thermostat off.",
       "name": "[%key:common::action::turn_off%]"
     },
     "turn_on": {
-      "description": "Turns climate device on.",
+      "description": "Turns thermostat on.",
       "name": "[%key:common::action::turn_on%]"
     }
   },
   "title": "Climate",
   "triggers": {
     "current_humidity_changed": {
-      "description": "Triggers after the humidity measured by one or more climate-control devices changes.",
+      "description": "Triggers after the humidity measured by one or more thermostats changes.",
       "fields": {
         "above": {
           "description": "Trigger when the humidity is above this value.",
@@ -324,10 +324,10 @@
           "name": "Below"
         }
       },
-      "name": "Climate-control device current humidity changed"
+      "name": "Thermostat current humidity changed"
     },
     "current_humidity_crossed_threshold": {
-      "description": "Triggers after the humidity measured by one or more climate-control devices crosses a threshold.",
+      "description": "Triggers after the humidity measured by one or more thermostats crosses a threshold.",
       "fields": {
         "behavior": {
           "description": "[%key:component::climate::common::trigger_behavior_description%]",
@@ -346,10 +346,10 @@
           "name": "Upper threshold"
         }
       },
-      "name": "Climate-control device current humidity crossed threshold"
+      "name": "Thermostat current humidity crossed threshold"
     },
     "current_temperature_changed": {
-      "description": "Triggers after the temperature measured by one or more climate-control devices changes.",
+      "description": "Triggers after the temperature measured by one or more thermostats changes.",
       "fields": {
         "above": {
           "description": "Trigger when the temperature is above this value.",
@@ -360,10 +360,10 @@
           "name": "Below"
         }
       },
-      "name": "Climate-control device current temperature changed"
+      "name": "Thermostat current temperature changed"
     },
     "current_temperature_crossed_threshold": {
-      "description": "Triggers after the temperature measured by one or more climate-control devices crosses a threshold.",
+      "description": "Triggers after the temperature measured by one or more thermostats crosses a threshold.",
       "fields": {
         "behavior": {
           "description": "[%key:component::climate::common::trigger_behavior_description%]",
@@ -382,10 +382,10 @@
           "name": "Upper threshold"
         }
       },
-      "name": "Climate-control device current temperature crossed threshold"
+      "name": "Thermostat current temperature crossed threshold"
     },
     "hvac_mode_changed": {
-      "description": "Triggers after the mode of one or more climate-control devices changes.",
+      "description": "Triggers after the mode of one or more thermostats changes.",
       "fields": {
         "behavior": {
           "description": "[%key:component::climate::common::trigger_behavior_description%]",
@@ -396,40 +396,40 @@
           "name": "Modes"
         }
       },
-      "name": "Climate-control device mode changed"
+      "name": "Thermostat mode changed"
     },
     "started_cooling": {
-      "description": "Triggers after one or more climate-control devices start cooling.",
+      "description": "Triggers after one or more thermostats start cooling.",
       "fields": {
         "behavior": {
           "description": "[%key:component::climate::common::trigger_behavior_description%]",
           "name": "[%key:component::climate::common::trigger_behavior_name%]"
         }
       },
-      "name": "Climate-control device started cooling"
+      "name": "Thermostat started cooling"
     },
     "started_drying": {
-      "description": "Triggers after one or more climate-control devices start drying.",
+      "description": "Triggers after one or more thermostats start drying.",
       "fields": {
         "behavior": {
           "description": "[%key:component::climate::common::trigger_behavior_description%]",
           "name": "[%key:component::climate::common::trigger_behavior_name%]"
         }
       },
-      "name": "Climate-control device started drying"
+      "name": "Thermostat started drying"
     },
     "started_heating": {
-      "description": "Triggers after one or more climate-control devices start heating.",
+      "description": "Triggers after one or more thermostats start heating.",
       "fields": {
         "behavior": {
           "description": "[%key:component::climate::common::trigger_behavior_description%]",
           "name": "[%key:component::climate::common::trigger_behavior_name%]"
         }
       },
-      "name": "Climate-control device started heating"
+      "name": "Thermostat started heating"
     },
     "target_humidity_changed": {
-      "description": "Triggers after the humidity setpoint of one or more climate-control devices changes.",
+      "description": "Triggers after the humidity setpoint of one or more thermostats changes.",
       "fields": {
         "above": {
           "description": "Trigger when the target humidity is above this value.",
@@ -440,10 +440,10 @@
           "name": "Below"
         }
       },
-      "name": "Climate-control device target humidity changed"
+      "name": "Thermostat target humidity changed"
     },
     "target_humidity_crossed_threshold": {
-      "description": "Triggers after the humidity setpoint of one or more climate-control devices crosses a threshold.",
+      "description": "Triggers after the humidity setpoint of one or more thermostats crosses a threshold.",
       "fields": {
         "behavior": {
           "description": "[%key:component::climate::common::trigger_behavior_description%]",
@@ -462,10 +462,10 @@
           "name": "Upper threshold"
         }
       },
-      "name": "Climate-control device target humidity crossed threshold"
+      "name": "Thermostat target humidity crossed threshold"
     },
     "target_temperature_changed": {
-      "description": "Triggers after the temperature setpoint of one or more climate-control devices changes.",
+      "description": "Triggers after the temperature setpoint of one or more thermostats changes.",
       "fields": {
         "above": {
           "description": "Trigger when the target temperature is above this value.",
@@ -476,10 +476,10 @@
           "name": "Below"
         }
       },
-      "name": "Climate-control device target temperature changed"
+      "name": "Thermostat target temperature changed"
     },
     "target_temperature_crossed_threshold": {
-      "description": "Triggers after the temperature setpoint of one or more climate-control devices crosses a threshold.",
+      "description": "Triggers after the temperature setpoint of one or more thermostats crosses a threshold.",
       "fields": {
         "behavior": {
           "description": "[%key:component::climate::common::trigger_behavior_description%]",
@@ -498,27 +498,27 @@
           "name": "Upper threshold"
         }
       },
-      "name": "Climate-control device target temperature crossed threshold"
+      "name": "Thermostat target temperature crossed threshold"
     },
     "turned_off": {
-      "description": "Triggers after one or more climate-control devices turn off.",
+      "description": "Triggers after one or more thermostats turn off.",
       "fields": {
         "behavior": {
           "description": "[%key:component::climate::common::trigger_behavior_description%]",
           "name": "[%key:component::climate::common::trigger_behavior_name%]"
         }
       },
-      "name": "Climate-control device turned off"
+      "name": "Thermostat turned off"
     },
     "turned_on": {
-      "description": "Triggers after one or more climate-control devices turn on, regardless of the mode.",
+      "description": "Triggers after one or more thermostats turn on, regardless of the mode.",
       "fields": {
         "behavior": {
           "description": "[%key:component::climate::common::trigger_behavior_description%]",
           "name": "[%key:component::climate::common::trigger_behavior_name%]"
         }
       },
-      "name": "Climate-control device turned on"
+      "name": "Thermostat turned on"
     }
   }
 }

homeassistant/components/lock/condition.py

@@ -1,18 +0,0 @@
-"""Provides conditions for locks."""
-
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.condition import Condition, make_entity_state_condition
-
-from .const import DOMAIN, LockState
-
-CONDITIONS: dict[str, type[Condition]] = {
-    "is_jammed": make_entity_state_condition(DOMAIN, LockState.JAMMED),
-    "is_locked": make_entity_state_condition(DOMAIN, LockState.LOCKED),
-    "is_open": make_entity_state_condition(DOMAIN, LockState.OPEN),
-    "is_unlocked": make_entity_state_condition(DOMAIN, LockState.UNLOCKED),
-}
-
-
-async def async_get_conditions(hass: HomeAssistant) -> dict[str, type[Condition]]:
-    """Return the conditions for locks."""
-    return CONDITIONS

homeassistant/components/lock/conditions.yaml

@@ -1,19 +0,0 @@
-.condition_common: &condition_common
-  target:
-    entity:
-      domain: lock
-  fields:
-    behavior:
-      required: true
-      default: any
-      selector:
-        select:
-          translation_key: condition_behavior
-          options:
-            - all
-            - any
-
-is_jammed: *condition_common
-is_locked: *condition_common
-is_open: *condition_common
-is_unlocked: *condition_common

homeassistant/components/lock/icons.json

@@ -1,18 +1,4 @@
 {
-  "conditions": {
-    "is_jammed": {
-      "condition": "mdi:lock-alert"
-    },
-    "is_locked": {
-      "condition": "mdi:lock"
-    },
-    "is_open": {
-      "condition": "mdi:lock-open-variant"
-    },
-    "is_unlocked": {
-      "condition": "mdi:lock-open-variant"
-    }
-  },
   "entity_component": {
     "_": {
       "default": "mdi:lock",

homeassistant/components/lock/strings.json

@@ -1,52 +1,8 @@
 {
   "common": {
-    "condition_behavior_description": "How the state should match on the targeted locks.",
-    "condition_behavior_name": "Behavior",
     "trigger_behavior_description": "The behavior of the targeted locks to trigger on.",
     "trigger_behavior_name": "Behavior"
   },
-  "conditions": {
-    "is_jammed": {
-      "description": "Tests if one or more locks are jammed.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::lock::common::condition_behavior_description%]",
-          "name": "[%key:component::lock::common::condition_behavior_name%]"
-        }
-      },
-      "name": "Lock is jammed"
-    },
-    "is_locked": {
-      "description": "Tests if one or more locks are locked.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::lock::common::condition_behavior_description%]",
-          "name": "[%key:component::lock::common::condition_behavior_name%]"
-        }
-      },
-      "name": "Lock is locked"
-    },
-    "is_open": {
-      "description": "Tests if one or more locks are open.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::lock::common::condition_behavior_description%]",
-          "name": "[%key:component::lock::common::condition_behavior_name%]"
-        }
-      },
-      "name": "Lock is open"
-    },
-    "is_unlocked": {
-      "description": "Tests if one or more locks are unlocked.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::lock::common::condition_behavior_description%]",
-          "name": "[%key:component::lock::common::condition_behavior_name%]"
-        }
-      },
-      "name": "Lock is unlocked"
-    }
-  },
   "device_automation": {
     "action_type": {
       "lock": "Lock {entity_name}",
@@ -99,12 +55,6 @@
     }
   },
   "selector": {
-    "condition_behavior": {
-      "options": {
-        "all": "All",
-        "any": "Any"
-      }
-    },
     "trigger_behavior": {
       "options": {
         "any": "Any",

tests/components/lock/test_condition.py

@@ -1,179 +0,0 @@
-"""Test lock conditions."""
-
-from typing import Any
-
-import pytest
-
-from homeassistant.components.lock.const import LockState
-from homeassistant.core import HomeAssistant
-
-from tests.components import (
-    ConditionStateDescription,
-    assert_condition_gated_by_labs_flag,
-    create_target_condition,
-    other_states,
-    parametrize_condition_states_all,
-    parametrize_condition_states_any,
-    parametrize_target_entities,
-    set_or_remove_state,
-    target_entities,
-)
-
-
-@pytest.fixture
-async def target_locks(hass: HomeAssistant) -> list[str]:
-    """Create multiple lock entities associated with different targets."""
-    return (await target_entities(hass, "lock"))["included"]
-
-
-@pytest.mark.parametrize(
-    "condition",
-    [
-        "lock.is_jammed",
-        "lock.is_locked",
-        "lock.is_open",
-        "lock.is_unlocked",
-    ],
-)
-async def test_lock_conditions_gated_by_labs_flag(
-    hass: HomeAssistant, caplog: pytest.LogCaptureFixture, condition: str
-) -> None:
-    """Test the lock conditions are gated by the labs flag."""
-    await assert_condition_gated_by_labs_flag(hass, caplog, condition)
-
-
-@pytest.mark.usefixtures("enable_labs_preview_features")
-@pytest.mark.parametrize(
-    ("condition_target_config", "entity_id", "entities_in_target"),
-    parametrize_target_entities("lock"),
-)
-@pytest.mark.parametrize(
-    ("condition", "condition_options", "states"),
-    [
-        *parametrize_condition_states_any(
-            condition="lock.is_jammed",
-            target_states=[LockState.JAMMED],
-            other_states=other_states(LockState.JAMMED),
-        ),
-        *parametrize_condition_states_any(
-            condition="lock.is_locked",
-            target_states=[LockState.LOCKED],
-            other_states=other_states(LockState.LOCKED),
-        ),
-        *parametrize_condition_states_any(
-            condition="lock.is_open",
-            target_states=[LockState.OPEN],
-            other_states=other_states(LockState.OPEN),
-        ),
-        *parametrize_condition_states_any(
-            condition="lock.is_unlocked",
-            target_states=[LockState.UNLOCKED],
-            other_states=other_states(LockState.UNLOCKED),
-        ),
-    ],
-)
-async def test_lock_state_condition_behavior_any(
-    hass: HomeAssistant,
-    target_locks: list[str],
-    condition_target_config: dict,
-    entity_id: str,
-    entities_in_target: int,
-    condition: str,
-    condition_options: dict[str, Any],
-    states: list[ConditionStateDescription],
-) -> None:
-    """Test the lock state condition with the 'any' behavior."""
-    other_entity_ids = set(target_locks) - {entity_id}
-
-    # Set all locks, including the tested lock, to the initial state
-    for eid in target_locks:
-        set_or_remove_state(hass, eid, states[0]["included"])
-        await hass.async_block_till_done()
-
-    condition = await create_target_condition(
-        hass,
-        condition=condition,
-        target=condition_target_config,
-        behavior="any",
-    )
-
-    for state in states:
-        included_state = state["included"]
-        set_or_remove_state(hass, entity_id, included_state)
-        await hass.async_block_till_done()
-        assert condition(hass) == state["condition_true"]
-
-        # Check if changing other locks also passes the condition
-        for other_entity_id in other_entity_ids:
-            set_or_remove_state(hass, other_entity_id, included_state)
-            await hass.async_block_till_done()
-        assert condition(hass) == state["condition_true"]
-
-
-@pytest.mark.usefixtures("enable_labs_preview_features")
-@pytest.mark.parametrize(
-    ("condition_target_config", "entity_id", "entities_in_target"),
-    parametrize_target_entities("lock"),
-)
-@pytest.mark.parametrize(
-    ("condition", "condition_options", "states"),
-    [
-        *parametrize_condition_states_all(
-            condition="lock.is_jammed",
-            target_states=[LockState.JAMMED],
-            other_states=other_states(LockState.JAMMED),
-        ),
-        *parametrize_condition_states_all(
-            condition="lock.is_locked",
-            target_states=[LockState.LOCKED],
-            other_states=other_states(LockState.LOCKED),
-        ),
-        *parametrize_condition_states_all(
-            condition="lock.is_open",
-            target_states=[LockState.OPEN],
-            other_states=other_states(LockState.OPEN),
-        ),
-        *parametrize_condition_states_all(
-            condition="lock.is_unlocked",
-            target_states=[LockState.UNLOCKED],
-            other_states=other_states(LockState.UNLOCKED),
-        ),
-    ],
-)
-async def test_lock_state_condition_behavior_all(
-    hass: HomeAssistant,
-    target_locks: list[str],
-    condition_target_config: dict,
-    entity_id: str,
-    entities_in_target: int,
-    condition: str,
-    condition_options: dict[str, Any],
-    states: list[ConditionStateDescription],
-) -> None:
-    """Test the lock state condition with the 'all' behavior."""
-    other_entity_ids = set(target_locks) - {entity_id}
-
-    # Set all locks, including the tested lock, to the initial state
-    for eid in target_locks:
-        set_or_remove_state(hass, eid, states[0]["included"])
-        await hass.async_block_till_done()
-
-    condition = await create_target_condition(
-        hass,
-        condition=condition,
-        target=condition_target_config,
-        behavior="all",
-    )
-
-    for state in states:
-        included_state = state["included"]
-
-        set_or_remove_state(hass, entity_id, included_state)
-        await hass.async_block_till_done()
-        assert condition(hass) == state["condition_true_first_entity"]
-
-        for other_entity_id in other_entity_ids:
-            set_or_remove_state(hass, other_entity_id, included_state)
-            await hass.async_block_till_done()
-
-        assert condition(hass) == state["condition_true"]