Fix hardcoded temperature related terms

Author: abmantis

source/_conditions/temperature.is_value.markdown

@@ -19,14 +19,19 @@ When you target more than one entity, the condition's **Condition passes if** op
    areas="bedroom or living room"
    reading="temperature"
    value_long="a fixed temperature directly, for example `20` for 20°C"
-   has_unit="true" %}
+   has_unit="true"
+   unit_label="temperature unit"
+   unit_options="°C or °F" %}
 
 ### Options in the UI
 
 {% include conditions/threshold_value_options_ui.md
    reading="temperature"
    value_short="a fixed temperature value"
-   has_unit="true" %}
+   has_unit="true"
+   unit_label="temperature unit"
+   unit_options_code="`°C` or `°F`"
+   unit_default="°C" %}
 
 {% include conditions/yaml_header.md %}
 
@@ -92,6 +97,9 @@ This passes when the living room temperature sensor reads between 20 and 22°C.
 {% include conditions/threshold_value_options_yaml.md
    reading="temperature"
    has_unit="true"
+   unit_default="°C"
+   unit_example_entity="input_number.comfort_temperature_min"
+   unit_example_value="22"
    threshold_required="true" %}
 
 {% include conditions/targets.md %}

source/_includes/conditions/threshold_value_options_ui.md

@@ -3,18 +3,22 @@ Reusable "Options in the UI" block for entity conditions that test a reading
 against the threshold-mapping schema.
 
 Parameters:
-  reading      quantity noun, e.g. "humidity"
-  value_short  Number-entry phrasing, e.g. "a fixed percentage (0–100)"
-  has_unit     set (to anything) to add a "Unit" row for the temperature unit
+  reading            quantity noun, e.g. "humidity"
+  value_short        Number-entry phrasing, e.g. "a fixed percentage (0–100)"
+  has_unit           set (to anything) to add a "Unit" row (requires unit_label,
+                     unit_options_code, unit_default)
+  unit_label         unit-kind label, e.g. "temperature unit", "energy unit"
+  unit_options_code  inline-code list of allowed units, e.g. "`°C` or `°F`"
+  unit_default       default unit, e.g. "°C"
 {% endcomment %}
 {% options_ui %}
 Threshold type:
   description: |
     The {{ include.reading }} level the entity has to meet for the condition to pass. **Above** and **Below** are exclusive: a reading equal to the threshold does not pass. **In range** is exclusive at both bounds. **Outside range** is inclusive: a reading equal to either bound passes. Choose **Number** to enter {{ include.value_short }}, or **Entity** to use a sensor or number helper as a dynamic threshold.
 {% if include.has_unit %}
 Unit:
-  description: The temperature unit to use for threshold comparison. Accepts `°C` or `°F`. Required when using numerical thresholds (not required when using entity references).
-  default: °C
+  description: The {{ include.unit_label }} to use for threshold comparison. Accepts {{ include.unit_options_code }}. Required when using numerical thresholds (not required when using entity references).
+  default: {{ include.unit_default }}
 {% endif %}
 Condition passes if:
   description: |

source/_includes/conditions/threshold_value_options_yaml.md

@@ -2,14 +2,19 @@
 Reusable "Options in YAML" block for entity conditions that test a reading
 against the threshold-mapping schema. The `behavior` description is shared
 across the family. Unitless members (humidity, brightness, counter) get the
-per-type "Provide value..." guidance; members with a temperature unit get the
-unit_of_measurement guidance and a unit-style example instead.
+per-type "Provide value..." guidance; members with a unit (temperature, energy,
+etc.) get the unit_of_measurement guidance and a unit-style example instead.
 
 Parameters:
-  reading             quantity noun, e.g. "humidity"
+  reading             quantity noun, e.g. "humidity", "temperature"
   range_note          parenthetical range for above/below (unitless), e.g. "0–100"
   number_final        closing number guidance (unitless), e.g. "a percentage value (0–100)"
-  has_unit            set (to anything) for temperature unit_of_measurement guidance + example
+  has_unit            set (to anything) for unit_of_measurement guidance + example
+                      (requires unit_default, unit_example_entity, unit_example_value)
+  unit_default        default unit used in the example, e.g. "°C"
+  unit_example_entity entity reference used in the example, e.g.
+                      "input_number.comfort_temperature_min"
+  unit_example_value  literal number used in the example, e.g. "22"
   threshold_required  "true" or "false" for the threshold field (default "false")
 {% endcomment %}
 {% options_yaml %}
@@ -29,13 +34,13 @@ threshold:
     threshold:
       type: between
       value_min:
-        entity: input_number.comfort_temperature_min
+        entity: {{ include.unit_example_entity }}
       value_max:
-        number: 22
-        unit_of_measurement: °C
+        number: {{ include.unit_example_value }}
+        unit_of_measurement: {{ include.unit_default }}
     ```
 
-    When using an `entity`, its current reading is used as the threshold at the moment the condition is evaluated, which lets you compare two temperature readings dynamically.
+    When using an `entity`, its current reading is used as the threshold at the moment the condition is evaluated, which lets you compare two {{ include.reading }} readings dynamically.
 {% else %}
 
     For the `number` key, use {{ include.number_final }}. For the `entity` key, use an `input_number`, `number`, or `sensor` entity.

source/_includes/conditions/threshold_value_steps.md

@@ -5,12 +5,14 @@ range). Used by humidity.is_value; reusable by climate.target_humidity,
 light.is_brightness, counter.is_value, and similar.
 
 Parameters:
-  title       UI display name, e.g. "Relative humidity"
-  sensor      sensor noun, e.g. "humidity sensor"
-  areas       example areas, e.g. "bedroom or bathroom"
-  reading     quantity noun, e.g. "humidity"
-  value_long  Number-entry phrasing, e.g. "a fixed percentage directly, for example `65` for 65%"
-  has_unit    set (to anything) to add a "Unit" step for the temperature unit
+  title         UI display name, e.g. "Relative humidity"
+  sensor        sensor noun, e.g. "humidity sensor"
+  areas         example areas, e.g. "bedroom or bathroom"
+  reading       quantity noun, e.g. "humidity"
+  value_long    Number-entry phrasing, e.g. "a fixed percentage directly, for example `65` for 65%"
+  has_unit      set (to anything) to add a "Unit" step (requires unit_label, unit_options)
+  unit_label    unit-kind label, e.g. "temperature unit", "energy unit"
+  unit_options  bare list of allowed units for prose, e.g. "°C or °F"
 {% endcomment %}
 To use **{{ include.title }}** in an automation:
 
@@ -29,7 +31,7 @@ To use **{{ include.title }}** in an automation:
         - For **In range** or **Outside range**, you need two entities: one for the lower bound and one for the upper bound (for example, two separate number helpers).
         - If you don't have a number helper, you can create one by selecting **Create a new number helper**.
 {%- if include.has_unit %}
-7. Under **Unit**, select the temperature unit (°C or °F) to use for the threshold comparison.
+7. Under **Unit**, select the {{ include.unit_label }} ({{ include.unit_options }}) to use for the threshold comparison.
 {%- endif %}
 8. Under **Condition passes if** (see [Behavior](#behavior-with-multiple-targets)), pick **Any** or **All**.
 9. Select **Save**.

source/_includes/triggers/threshold_changed_options_ui.md

@@ -3,8 +3,12 @@ Reusable "Options in the UI" block for "changed" entity triggers that use the
 threshold-mapping schema.
 
 Parameters:
-  unit_phrase_ui  value-entry phrasing, e.g. "a fixed percentage (0–100%)"
-  has_unit        set (to anything) to add a "Unit" row for the temperature unit
+  unit_phrase_ui     value-entry phrasing, e.g. "a fixed percentage (0–100%)"
+  has_unit           set (to anything) to add a "Unit" row (requires unit_label,
+                     unit_options_code, unit_default)
+  unit_label         unit-kind label, e.g. "temperature unit", "energy unit"
+  unit_options_code  inline-code list of allowed units, e.g. "`°C` or `°F`"
+  unit_default       default unit, e.g. "°C"
 {% endcomment %}
 {% options_ui %}
 Threshold type:
@@ -19,6 +23,6 @@ Threshold type:
     For each mode you can enter {{ include.unit_phrase_ui }} or reference a sensor entity or a [number helper](/integrations/input_number/) entity.
 {% if include.has_unit %}
 Unit:
-  description: The temperature unit to use for threshold comparison. Accepts `°C` or `°F`. Required when using numerical thresholds (not required when using entity references). Default is `°C`.
+  description: The {{ include.unit_label }} to use for threshold comparison. Accepts {{ include.unit_options_code }}. Required when using numerical thresholds (not required when using entity references). Default is `{{ include.unit_default }}`.
 {% endif %}
 {% endoptions_ui %}

source/_includes/triggers/threshold_changed_options_yaml.md

@@ -3,9 +3,17 @@ Reusable "Options in YAML" block for "changed" entity triggers that use the
 threshold-mapping schema.
 
 Parameters:
-  reading           quantity noun, e.g. "humidity"
-  unit_phrase_yaml  literal-value phrasing, e.g. "literal percentage 0–100"
-  has_unit          set (to anything) to add the temperature unit_of_measurement note
+  reading             quantity noun, e.g. "humidity", "temperature"
+  unit_phrase_yaml    literal-value phrasing, e.g. "literal percentage 0–100"
+  has_unit            set (to anything) to add unit_of_measurement guidance + example
+                      (requires unit_label, unit_options_code, unit_default,
+                      unit_example_entity, unit_example_value)
+  unit_label          unit-kind label, e.g. "temperature unit", "energy unit"
+  unit_options_code   inline-code list of allowed units, e.g. "`°C` or `°F`"
+  unit_default        default unit used in the example, e.g. "°C"
+  unit_example_entity entity reference used in the example, e.g.
+                      "input_number.comfort_temperature_min"
+  unit_example_value  literal number used in the example, e.g. "24"
 {% endcomment %}
 {% options_yaml %}
 threshold:
@@ -19,21 +27,21 @@ threshold:
     - `type: outside` (inclusive): Defines an outside-range. Fires when the reading is at or below `value_min`, or at or above `value_max`. Readings equal to either bound fire the trigger. Provide `value_min` and `value_max`, each with a `number` key (for a {{ include.unit_phrase_yaml }}) or an `entity` key (for an `input_number`, `number`, or `sensor` entity).
 {% if include.has_unit %}
 
-    When using the `number` key, you must also include `unit_of_measurement` to specify the temperature unit (`°C` or `°F`). When using the `entity` key, the unit is taken from the entity itself, or assumed to be the system temperature unit if the entity has no unit.
+    When using the `number` key, you must also include `unit_of_measurement` to specify the {{ include.unit_label }} ({{ include.unit_options_code }}). When using the `entity` key, the unit is taken from the entity itself, or assumed to be the system {{ include.unit_label }} if the entity has no unit.
 
     For example:
 
     ```yaml
     threshold:
       type: outside
       value_min:
-        entity: input_number.comfort_temperature_min
+        entity: {{ include.unit_example_entity }}
       value_max:
-        number: 24
-        unit_of_measurement: °C
+        number: {{ include.unit_example_value }}
+        unit_of_measurement: {{ include.unit_default }}
     ```
 
-    A `sensor` or `number` entity's current value is used as the threshold, which lets you compare two temperature readings dynamically.
+    A `sensor` or `number` entity's current value is used as the threshold, which lets you compare two {{ include.reading }} readings dynamically.
 {% endif %}
   required: true
   type: map

source/_includes/triggers/threshold_changed_steps.md

@@ -9,7 +9,9 @@ Parameters:
   sensor          sensor noun, e.g. "humidity sensor"
   areas           example areas, e.g. "bathroom or bedroom"
   unit_phrase_ui  value-entry phrasing, e.g. "a fixed percentage (0–100%)"
-  has_unit        set (to anything) to add a "Unit" step for the temperature unit
+  has_unit        set (to anything) to add a "Unit" step (requires unit_label, unit_options)
+  unit_label      unit-kind label, e.g. "temperature unit", "energy unit"
+  unit_options    bare list of allowed units for prose, e.g. "°C or °F"
 {% endcomment %}
 To use **{{ include.title }}** in an automation:
 
@@ -26,6 +28,6 @@ To use **{{ include.title }}** in an automation:
    - For each option, you can enter {{ include.unit_phrase_ui }}, pick a sensor entity or a [number helper](/integrations/input_number/) entity as the threshold.
      - If you don't have a number helper, you can create one by selecting **Create a new number helper**.
 {%- if include.has_unit %}
-7. Under **Unit**, select the temperature unit (°C or °F) to use for the threshold comparison.
+7. Under **Unit**, select the {{ include.unit_label }} ({{ include.unit_options }}) to use for the threshold comparison.
 {%- endif %}
 8. Select **Save**.

source/_includes/triggers/threshold_crossed_options_ui.md

@@ -3,8 +3,12 @@ Reusable "Options in the UI" block for "crossed threshold" entity triggers that
 use the threshold-mapping schema.
 
 Parameters:
-  unit_phrase_ui  value-entry phrasing, e.g. "a fixed percentage (0–100%)"
-  has_unit        set (to anything) to add a "Unit" row for the temperature unit
+  unit_phrase_ui     value-entry phrasing, e.g. "a fixed percentage (0–100%)"
+  has_unit           set (to anything) to add a "Unit" row (requires unit_label,
+                     unit_options_code, unit_default)
+  unit_label         unit-kind label, e.g. "temperature unit", "energy unit"
+  unit_options_code  inline-code list of allowed units, e.g. "`°C` or `°F`"
+  unit_default       default unit, e.g. "°C"
 {% endcomment %}
 {% options_ui %}
 Threshold type:
@@ -19,7 +23,7 @@ Threshold type:
     For each mode you can enter {{ include.unit_phrase_ui }} or reference a sensor entity or a [number helper](/integrations/input_number/) entity.
 {% if include.has_unit %}
 Unit:
-  description: The temperature unit to use for threshold comparison. Accepts `°C` or `°F`. Required when using numerical thresholds (not required when using entity references). Default is `°C`.
+  description: The {{ include.unit_label }} to use for threshold comparison. Accepts {{ include.unit_options_code }}. Required when using numerical thresholds (not required when using entity references). Default is `{{ include.unit_default }}`.
 {% endif %}
 Trigger when:
   description: |

source/_includes/triggers/threshold_crossed_options_yaml.md

@@ -2,13 +2,22 @@
 Reusable "Options in YAML" block for "crossed threshold" entity triggers that
 use the threshold-mapping schema. The `behavior` and `for` field descriptions
 are identical across the whole family. Suited to unitless members (humidity,
-brightness, battery); members with a temperature unit need an added
-unit_of_measurement note in the threshold description.
+brightness, battery); members with a unit (temperature, energy, etc.) get an
+added unit_of_measurement note in the threshold description.
 
 Parameters:
-  unit_phrase_yaml  literal-value phrasing, e.g. "literal percentage 0–100"
-  example_value     value used in the inline example (unitless members), e.g. "70"
-  has_unit          set (to anything) for the temperature unit note + a unit-style example
+  reading             quantity noun, e.g. "humidity", "temperature"
+  unit_phrase_yaml    literal-value phrasing, e.g. "literal percentage 0–100"
+  example_value       value used in the inline example (unitless members), e.g. "70"
+  has_unit            set (to anything) for unit_of_measurement note + a unit-style
+                      example (requires unit_label, unit_options_code, unit_default,
+                      unit_example_entity, unit_example_value)
+  unit_label          unit-kind label, e.g. "temperature unit", "energy unit"
+  unit_options_code   inline-code list of allowed units, e.g. "`°C` or `°F`"
+  unit_default        default unit used in the example, e.g. "°C"
+  unit_example_entity entity reference used in the example, e.g.
+                      "input_number.max_comfort_temperature"
+  unit_example_value  literal number used in the example, e.g. "18"
 {% endcomment %}
 {% options_yaml %}
 threshold:
@@ -22,21 +31,21 @@ threshold:
 
 {% if include.has_unit %}
 
-    When using the `number` key, you must also include `unit_of_measurement` to specify the temperature unit (`°C` or `°F`). When using the `entity` key, the unit is taken from the entity itself, or assumed to be the system temperature unit if the entity has no unit.
+    When using the `number` key, you must also include `unit_of_measurement` to specify the {{ include.unit_label }} ({{ include.unit_options_code }}). When using the `entity` key, the unit is taken from the entity itself, or assumed to be the system {{ include.unit_label }} if the entity has no unit.
 
     For example:
 
     ```yaml
     threshold:
       type: between
       value_min:
-        number: 18
-        unit_of_measurement: °C
+        number: {{ include.unit_example_value }}
+        unit_of_measurement: {{ include.unit_default }}
       value_max:
-        entity: input_number.max_comfort_temperature
+        entity: {{ include.unit_example_entity }}
     ```
 
-    A `sensor` or `number` entity's current value is used as the threshold, which lets you compare two temperature readings dynamically.
+    A `sensor` or `number` entity's current value is used as the threshold, which lets you compare two {{ include.reading }} readings dynamically.
 {% else %}
 
     For example:

source/_includes/triggers/threshold_crossed_steps.md

@@ -9,7 +9,9 @@ Parameters:
   sensor          sensor noun, e.g. "humidity sensor"
   areas           example areas, e.g. "bathroom or basement"
   unit_phrase_ui  value-entry phrasing, e.g. "a fixed percentage (0–100%)"
-  has_unit        set (to anything) to add a "Unit" step for the temperature unit
+  has_unit        set (to anything) to add a "Unit" step (requires unit_label, unit_options)
+  unit_label      unit-kind label, e.g. "temperature unit", "energy unit"
+  unit_options    bare list of allowed units for prose, e.g. "°C or °F"
 {% endcomment %}
 To use **{{ include.title }}** in an automation:
 
@@ -25,7 +27,7 @@ To use **{{ include.title }}** in an automation:
    - For each option, you can enter {{ include.unit_phrase_ui }}, pick a sensor entity or a [number helper](/integrations/input_number/) entity as the threshold.
      - If you don't have a number helper, you can create one by selecting **Create a new number helper**.
 {%- if include.has_unit %}
-7. Under **Unit**, select the temperature unit (°C or °F) to use for the threshold comparison.
+7. Under **Unit**, select the {{ include.unit_label }} ({{ include.unit_options }}) to use for the threshold comparison.
 {%- endif %}
 8. Under **Trigger when** (see [Behavior](#behavior-with-multiple-targets)), pick **Each**, **First**, or **All** to control how the trigger behaves when multiple entities are targeted.
 9. Under **For at least**, set how long the reading must stay past the threshold before the trigger fires. Leave it at zero to fire immediately.