jeans/frontend
jeans/frontend
1
0
Fork 0
mirror of https://github.com/home-assistant/frontend.git synced 2025-07-24 09:46:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename service call to action (#21362)

Browse Source
This commit is contained in:
Bram Kragten 2024-07-11 09:00:15 +02:00 committed by GitHub
parent 5ead5ed058
commit d9583582e6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
13 changed files with 92 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/ha-service-control.ts
View File

@ -451,7 +451,7 @@ export class HaServiceControl extends LitElement {
>
<span slot="description"
>${this.hass.localize(
"ui.components.service-control.target_description"
"ui.components.service-control.target_secondary"
)}</span
><ha-selector
.hass=${this.hass}
@ -478,7 +478,9 @@ export class HaServiceControl extends LitElement {
${shouldRenderServiceDataYaml
? html`<ha-yaml-editor
.hass=${this.hass}
.label=${this.hass.localize("ui.components.service-control.data")}
.label=${this.hass.localize(
"ui.components.service-control.action_data"
)}
.name=${"data"}
.readOnly=${this.disabled}
.defaultValue=${this._value?.data}

2
src/components/ha-service-picker.ts
View File

@ -46,7 +46,7 @@ class HaServicePicker extends LitElement {
return html`
<ha-combo-box
.hass=${this.hass}
.label=${this.hass.localize("ui.components.service-picker.service")}
.label=${this.hass.localize("ui.components.service-picker.action")}
.filteredItems=${this._filteredServices(
this.hass.localize,
this.hass.services,

9
src/panels/config/cloud/account/cloud-tts-pref.ts
View File

@ -45,9 +45,12 @@ export class CloudTTSPref extends LitElement {
header=${this.hass.localize("ui.panel.config.cloud.account.tts.title")}
>
<div class="card-content">
${this.hass.localize("ui.panel.config.cloud.account.tts.info", {
service: '"tts.cloud_say"',
})}
${this.hass.localize(
"ui.panel.config.cloud.account.tts.description",
{
service: '"tts.cloud_say"',
}
)}
<br /><br />
<div class="row">
<ha-language-picker

2
src/panels/config/entities/entity-registry-settings-editor.ts
View File

@ -962,7 +962,7 @@ export class EntityRegistrySettingsEditor extends LitElement {
>
<span slot="description"
>${this.hass.localize(
"ui.dialogs.entity_registry.editor.hidden_description"
"ui.dialogs.entity_registry.editor.hidden_explanation"
)}</span
>
<ha-switch

2
src/panels/config/entities/ha-config-entities.ts
View File

@ -1177,7 +1177,7 @@ ${
{ number: this._selected.length }
),
text: this.hass.localize(
"ui.panel.config.entities.picker.hide_selected.confirm_text"
"ui.panel.config.entities.picker.hide_selected.confirm"
),
confirmText: this.hass.localize("ui.common.hide"),
dismissText: this.hass.localize("ui.common.cancel"),

47
src/panels/developer-tools/service/developer-tools-service.ts → src/panels/developer-tools/action/developer-tools-action.ts
View File

@ -2,7 +2,7 @@ import { mdiHelpCircle } from "@mdi/js";
import { ERR_CONNECTION_LOST } from "home-assistant-js-websocket";
import { load } from "js-yaml";
import { css, CSSResultGroup, html, LitElement, nothing } from "lit";
import { property, query, state } from "lit/decorators";
import { customElement, property, query, state } from "lit/decorators";
import memoizeOne from "memoize-one";
import { storage } from "../../../common/decorators/storage";
import { computeDomain } from "../../../common/entity/compute_domain";
@ -31,7 +31,8 @@ import { haStyle } from "../../../resources/styles";
import { HomeAssistant } from "../../../types";
import { documentationUrl } from "../../../util/documentation-url";
class HaPanelDevService extends LitElement {
@customElement("developer-tools-action")
class HaPanelDevAction extends LitElement {
@property({ attribute: false }) public hass!: HomeAssistant;
@property({ type: Boolean }) public narrow = false;
@ -112,7 +113,7 @@ class HaPanelDevService extends LitElement {
<div class="content">
<p>
${this.hass.localize(
"ui.panel.developer-tools.tabs.services.description"
"ui.panel.developer-tools.tabs.actions.description"
)}
</p>
<ha-card>
@ -154,23 +155,23 @@ class HaPanelDevService extends LitElement {
>
${this._yamlMode
? this.hass.localize(
"ui.panel.developer-tools.tabs.services.ui_mode"
"ui.panel.developer-tools.tabs.actions.ui_mode"
)
: this.hass.localize(
"ui.panel.developer-tools.tabs.services.yaml_mode"
"ui.panel.developer-tools.tabs.actions.yaml_mode"
)}
</mwc-button>
${!this._uiAvailable
? html`<span class="error"
>${this.hass.localize(
"ui.panel.developer-tools.tabs.services.no_template_ui_support"
"ui.panel.developer-tools.tabs.actions.no_template_ui_support"
)}</span
>`
: ""}
</div>
<ha-progress-button raised @click=${this._callService}>
${this.hass.localize(
"ui.panel.developer-tools.tabs.services.call_service"
"ui.panel.developer-tools.tabs.actions.call_service"
)}
</ha-progress-button>
</div>
@ -179,7 +180,7 @@ class HaPanelDevService extends LitElement {
? html`<div class="content">
<ha-card
.header=${this.hass.localize(
"ui.panel.developer-tools.tabs.services.response"
"ui.panel.developer-tools.tabs.actions.response"
)}
>
<div class="card-content">
@ -199,10 +200,10 @@ class HaPanelDevService extends LitElement {
<ha-expansion-panel
.header=${this._yamlMode
? this.hass.localize(
"ui.panel.developer-tools.tabs.services.all_parameters"
"ui.panel.developer-tools.tabs.actions.all_parameters"
)
: this.hass.localize(
"ui.panel.developer-tools.tabs.services.yaml_parameters"
"ui.panel.developer-tools.tabs.actions.yaml_parameters"
)}
outlined
.expanded=${this._yamlMode}
@ -213,7 +214,7 @@ class HaPanelDevService extends LitElement {
${target
? html`
${this.hass.localize(
"ui.panel.developer-tools.tabs.services.accepts_target"
"ui.panel.developer-tools.tabs.actions.accepts_target"
)}
`
: ""}
@ -244,17 +245,17 @@ class HaPanelDevService extends LitElement {
<tr>
<th>
${this.hass.localize(
"ui.panel.developer-tools.tabs.services.column_parameter"
"ui.panel.developer-tools.tabs.actions.column_parameter"
)}
</th>
<th>
${this.hass.localize(
"ui.panel.developer-tools.tabs.services.column_description"
"ui.panel.developer-tools.tabs.actions.column_description"
)}
</th>
<th>
${this.hass.localize(
"ui.panel.developer-tools.tabs.services.column_example"
"ui.panel.developer-tools.tabs.actions.column_example"
)}
</th>
</tr>
@ -281,7 +282,7 @@ class HaPanelDevService extends LitElement {
${this._yamlMode
? html`<mwc-button @click=${this._fillExampleData}
>${this.hass.localize(
"ui.panel.developer-tools.tabs.services.fill_example_data"
"ui.panel.developer-tools.tabs.actions.fill_example_data"
)}</mwc-button
>`
: ""}
@ -305,14 +306,14 @@ class HaPanelDevService extends LitElement {
const errorCategory = yamlMode ? "yaml" : "ui";
if (!serviceData?.service) {
return localize(
`ui.panel.developer-tools.tabs.services.errors.${errorCategory}.no_service`
`ui.panel.developer-tools.tabs.actions.errors.${errorCategory}.no_service`
);
}
const domain = computeDomain(serviceData.service);
const service = computeObjectId(serviceData.service);
if (!domain || !service) {
return localize(
`ui.panel.developer-tools.tabs.services.errors.${errorCategory}.invalid_service`
`ui.panel.developer-tools.tabs.actions.errors.${errorCategory}.invalid_service`
);
}
if (
@ -323,7 +324,7 @@ class HaPanelDevService extends LitElement {
!serviceData.data?.area_id
) {
return localize(
`ui.panel.developer-tools.tabs.services.errors.${errorCategory}.no_target`
`ui.panel.developer-tools.tabs.actions.errors.${errorCategory}.no_target`
);
}
for (const field of fields) {
@ -332,7 +333,7 @@ class HaPanelDevService extends LitElement {
(!serviceData.data || serviceData.data[field.key] === undefined)
) {
return localize(
`ui.panel.developer-tools.tabs.services.errors.${errorCategory}.missing_required_field`,
`ui.panel.developer-tools.tabs.actions.errors.${errorCategory}.missing_required_field`,
{ key: field.key }
);
}
@ -377,7 +378,7 @@ class HaPanelDevService extends LitElement {
forwardHaptic("failure");
button.actionError();
this._error = this.hass.localize(
"ui.panel.developer-tools.tabs.services.errors.yaml.invalid_yaml"
"ui.panel.developer-tools.tabs.actions.errors.yaml.invalid_yaml"
);
return;
}
@ -439,7 +440,7 @@ class HaPanelDevService extends LitElement {
}
this._error =
localizedErrorMessage ||
this.hass.localize("ui.notification_toast.service_call_failed", {
this.hass.localize("ui.notification_toast.action_failed", {
service: this._serviceData!.service!,
}) + ` ${err.message}`;
return;
@ -630,10 +631,8 @@ class HaPanelDevService extends LitElement {
}
}
customElements.define("developer-tools-service", HaPanelDevService);
declare global {
interface HTMLElementTagNameMap {
"developer-tools-service": HaPanelDevService;
"developer-tools-action": HaPanelDevAction;
}
}

7
src/panels/developer-tools/developer-tools-router.ts
View File

@ -24,9 +24,10 @@ class DeveloperToolsRouter extends HassRouterPage {
tag: "developer-tools-event",
load: () => import("./event/developer-tools-event"),
},
service: {
tag: "developer-tools-service",
load: () => import("./service/developer-tools-service"),
service: "action",
action: {
tag: "developer-tools-action",
load: () => import("./action/developer-tools-action"),
},
state: {
tag: "developer-tools-state",

6
src/panels/developer-tools/ha-panel-developer-tools.ts
View File

@ -62,10 +62,8 @@ class PanelDeveloperTools extends LitElement {
<paper-tab page-name="state">
${this.hass.localize("ui.panel.developer-tools.tabs.states.title")}
</paper-tab>
<paper-tab page-name="service">
${this.hass.localize(
"ui.panel.developer-tools.tabs.services.title"
)}
<paper-tab page-name="action">
${this.hass.localize("ui.panel.developer-tools.tabs.actions.title")}
</paper-tab>
<paper-tab page-name="template">
${this.hass.localize(

2
src/panels/lovelace/common/compute-tooltip.ts
View File

@ -45,7 +45,7 @@ function computeActionTooltip(
break;
case "call-service":
tooltip += `${hass.localize(
"ui.panel.lovelace.cards.picture-elements.call_service",
"ui.panel.lovelace.cards.picture-elements.perform_action",
{ name: config.service }
)}`;
break;

2
src/panels/lovelace/common/handle-action.ts
View File

@ -148,7 +148,7 @@ export const handleAction = async (
case "call-service": {
if (!actionConfig.service) {
showToast(node, {
message: hass.localize("ui.panel.lovelace.cards.actions.no_service"),
message: hass.localize("ui.panel.lovelace.cards.actions.no_action"),
});
forwardHaptic("failure");
return;

1
src/panels/lovelace/editor/config-elements/hui-tile-card-editor.ts
View File

@ -407,7 +407,6 @@ export class HuiTileCardEditor
return this.hass!.localize(
`ui.panel.lovelace.editor.card.tile.${schema.name}`
);
default:
return this.hass!.localize(
`ui.panel.lovelace.editor.card.generic.${schema.name}`

2
src/state/connection-mixin.ts
View File

@ -135,7 +135,7 @@ export const connectionMixin = <T extends Constructor<HassBaseEl>>(
const message =
localizedErrorMessage ||
(this as any).hass.localize(
"ui.notification_toast.service_call_failed",
"ui.notification_toast.action_failed",
"service",
`${domain}/${service}`
) +

93
src/translations/en.json
View File

@ -429,7 +429,7 @@
"triggered_by": "triggered by",
"triggered_by_automation": "triggered by automation",
"triggered_by_script": "triggered by script",
"triggered_by_service": "triggered by service",
"triggered_by_action": "triggered by action",
"triggered_by_numeric_state_of": "triggered by numeric state of",
"triggered_by_state_of": "triggered by state of",
"triggered_by_event": "triggered by event",
@ -773,13 +773,13 @@
}
},
"service-picker": {
"service": "Service"
"action": "Action"
},
"service-control": {
"required": "This field is required",
"target": "Targets",
"target_description": "What should this service use as targeted areas, devices or entities.",
"data": "Service data",
"target_secondary": "What should this action use as targeted areas, devices or entities.",
"action_data": "Action data",
"integration_doc": "Integration documentation"
},
"related-items": {
@ -1352,7 +1352,7 @@
"enabled_description": "Disabled entities will not be added to Home Assistant.",
"enabled_delay_confirm": "The enabled entities will be added to Home Assistant in {delay} seconds",
"enabled_restart_confirm": "Restart Home Assistant to finish enabling the entities",
"hidden_description": "Hidden entities will not be shown on your dashboard or included when indirectly referenced (ie via an area or device). Their history is still tracked and you can still interact with them with services.",
"hidden_explanation": "Hidden entities will not be shown on your dashboard or included when indirectly referenced (ie via an area or device). Their history is still tracked and you can still interact with them with actions.",
"delete": "Delete",
"confirm_delete": "Are you sure you want to delete this entity?",
"update": "Update",
@ -1603,7 +1603,7 @@
"view_network": "View network"
},
"services": {
"reconfigure": "Reconfigure ZHA device (heal device). Use this if you are having issues with the device. If the device in question is a battery powered device please ensure it is awake and accepting commands when you use this service.",
"reconfigure": "Reconfigure ZHA device (heal device). Use this if you are having issues with the device. If the device in question is a battery powered device please ensure it is awake and accepting commands when you use this action.",
"updateDeviceName": "Set a custom name for this device in the device registry.",
"remove": "Remove a device from the Zigbee network.",
"zigbee_information": "View the Zigbee information for the device."
@ -1732,7 +1732,7 @@
"step_3": "Tap {link_apps_services} and choose {home_assistant} from the list.",
"linked_matter_apps_services": "Linked Matter apps and services",
"link_apps_services": "Link apps & services",
"no_home_assistant": "I can’t find Home Assistant on the list",
"no_home_assistant": "I can''t find Home Assistant on the list",
"redirect": "You are redirected to the Home Assistant app. Please follow the instructions."
},
"google_home_fallback": {
@ -1807,7 +1807,7 @@
"dismiss_all": "Dismiss all"
},
"notification_toast": {
"service_call_failed": "Failed to call service {service}.",
"action_failed": "Failed to perform the action {service}.",
"connection_lost": "Connection lost. Reconnecting…",
"started": "Home Assistant has started!",
"starting": "Home Assistant is starting, not everything will be available until it is finished.",
@ -2660,7 +2660,7 @@
"run_text_pipeline": "Run text pipeline",
"run_audio_pipeline": "Run audio pipeline",
"run_audio_with_wake": "Run audio pipeline with wake word detection",
"response": "[%key:ui::panel::developer-tools::tabs::services::response%]",
"response": "[%key:ui::panel::developer-tools::tabs::actions::response%]",
"send": "Send",
"continue_listening": "Continue listening for wake word",
"continue_talking": "Continue talking",
@ -3267,18 +3267,19 @@
},
"type": {
"service": {
"label": "Call service",
"label": "Perform action",
"response_variable": "Response variable",
"has_optional_response": "This service can return a response, if you want to use the response, enter the name of a variable the response will be saved in",
"has_response": "This service returns a response, enter the name of a variable the response will be saved in",
"has_optional_response": "This action can return a response, if you want to use the response, enter the name of a variable the response will be saved in",
"has_response": "This action returns a response, enter the name of a variable the response will be saved in",
"description": {
"service_based_on_template": "Call a service based on a template on {targets}",
"service_based_on_name": "Call a service ''{name}'' on {targets}",
"picker": "Previously known as call service.",
"service_based_on_template": "Perform an action based on a template on {targets}",
"service_based_on_name": "Perform action ''{name}'' on {targets}",
"service_name": "{domain} ''{name}'' on {targets}",
"service_based_on_template_no_targets": "Call a service based on a template",
"service_based_on_name_no_targets": "Call a service ''{name}''",
"service_based_on_template_no_targets": "Perform an action based on a template",
"service_based_on_name_no_targets": "Perform action ''{name}''",
"service_name_no_targets": "{domain} ''{name}''",
"service": "Call a service",
"service": "Perform an action",
"target_template": "templated {name}",
"target_unknown_entity": "unknown entity",
"target_unknown_device": "unknown device",
@ -3837,7 +3838,7 @@
"fetching_subscription": "Fetching subscription…",
"tts": {
"title": "Text-to-speech",
"info": "Bring personality to your home by having it speak to you by using our text-to-speech services. You can use this in automations and scripts by using the {service} service.",
"description": "Bring personality to your home by having it speak to you by using our text-to-speech services. You can use this in automations and scripts by using the {service} action.",
"default_language": "Default language to use",
"default_voice": "Default voice to use",
"try": "Try",
@ -4122,7 +4123,7 @@
"hide_selected": {
"button": "Hide selected",
"confirm_title": "Do you want to hide {number} {number, plural,\n one {entity}\n other {entities}\n}?",
"confirm_text": "Hidden entities will not be shown on your dashboard. Their history is still tracked and you can still interact with them with services."
"confirm": "Hidden entities will not be shown on your dashboard. Their history is still tracked and you can still interact with them with actions."
},
"unhide_selected": {
"button": "Unhide selected"
@ -5280,7 +5281,7 @@
"no_entity_toggle": "No entity provided to toggle",
"no_navigation_path": "No navigation path specified",
"no_url": "No URL to open specified",
"no_service": "No service to run specified"
"no_action": "No action to run specified"
},
"empty_state": {
"title": "Welcome Home",
@ -5310,7 +5311,7 @@
"navigate_to": "Navigate to {location}",
"url": "Open window to {url_path}",
"toggle": "Toggle {name}",
"call_service": "Call service {name}",
"perform_action": "Perform action {name}",
"more_info": "Show more info: {name}"
},
"iframe": {
@ -5625,14 +5626,14 @@
"start_listening": "Start listening",
"pipeline_id": "Assistant",
"actions": {
"default_action": "Default action",
"call-service": "Call service",
"default_action": "Default",
"call-service": "Perform action",
"more-info": "More info",
"toggle": "Toggle",
"navigate": "Navigate",
"assist": "Assist",
"url": "URL",
"none": "No action"
"none": "Nothing"
}
},
"condition-editor": {
@ -5740,7 +5741,7 @@
},
"entity_row": {
"divider": "Divider",
"call-service": "Call service",
"call-service": "Perform action",
"section": "Section",
"weblink": "Web link",
"attribute": "Attribute",
@ -5757,7 +5758,7 @@
"button": {
"name": "Button",
"description": "The Button card allows you to add buttons to perform tasks.",
"default_action_help": "The default action depends on the entity's capabilities, it will either be toggled or the more info dialog will be shown."
"default_action_help": "The default depends on the entity's capabilities, it will either be toggled or the more info dialog will be shown."
},
"entity-filter": {
"name": "Entity filter",
@ -5875,10 +5876,10 @@
"camera_image": "Camera entity",
"image_entity": "Image entity",
"camera_view": "Camera view",
"double_tap_action": "Double tap action",
"double_tap_action": "Double tap behavior",
"entities": "Entities",
"entity": "Entity",
"hold_action": "Hold action",
"hold_action": "Hold behavior",
"hours_to_show": "Hours to show",
"days_to_show": "Days to show",
"icon": "Icon",
@ -5895,7 +5896,7 @@
"show_icon": "Show icon?",
"show_name": "Show name?",
"show_state": "Show state?",
"tap_action": "Tap action",
"tap_action": "Tap behavior",
"title": "Title",
"theme": "Theme",
"unit": "Unit",
@ -5934,7 +5935,7 @@
},
"picture": {
"name": "Picture",
"description": "The Picture card allows you to set an image to use for navigation to various paths in your interface or to call a service."
"description": "The Picture card allows you to set an image to use for navigation to various paths in your interface or to perform an action."
},
"picture-elements": {
"name": "Picture elements",
@ -5946,7 +5947,7 @@
},
"picture-glance": {
"name": "Picture glance",
"description": "The Picture card allows you to set an image to use for navigation to various paths in your interface or to call a service.",
"description": "The Picture card allows you to set an image to use for navigation to various paths in your interface or to perform an action.",
"state_entity": "State entity"
},
"plant-status": {
@ -5973,7 +5974,7 @@
"name": "Tile",
"description": "The tile card gives you a quick overview of your entity. The card allow you to toggle the entity, show the more info dialog or custom actions.",
"color": "Color",
"icon_tap_action": "Icon tap action",
"icon_tap_action": "Icon tap behavior",
"actions": "Actions",
"appearance": "Appearance",
"default_color": "Default color (state)",
@ -6690,10 +6691,10 @@
"alert_event_type": "Event type is a mandatory field",
"notification_event_fired": "Event {type} successfully fired!"
},
"services": {
"title": "Services",
"description": "The service dev tool allows you to call any available service in Home Assistant.",
"call_service": "Call service",
"actions": {
"title": "Actions",
"description": "The actions dev tool allows you to perform any action available in Home Assistant.",
"call_service": "Perform action",
"response": "Response",
"column_parameter": "Parameter",
"column_description": "Description",
@ -6703,21 +6704,21 @@
"ui_mode": "Go to UI mode",
"yaml_parameters": "Parameters only available in YAML mode",
"all_parameters": "All available parameters",
"accepts_target": "This service accepts a target, for example: `entity_id: light.bed_light`",
"accepts_target": "This action accepts a target, for example: `entity_id: light.bed_light`",
"no_template_ui_support": "The UI does not support templates, you can still use the YAML editor.",
"errors": {
"ui": {
"no_service": "No service selected, please select a service",
"invalid_service": "Selected service is invalid, please select a valid service",
"no_target": "This service requires a target, please select a target from the picker",
"missing_required_field": "This service requires field {key}, please enter a valid value for {key}"
"no_service": "No action selected, please select an action",
"invalid_service": "Selected action is invalid, please select a valid action",
"no_target": "This action requires a target, please select a target from the picker",
"missing_required_field": "This action requires field {key}, please enter a valid value for {key}"
},
"yaml": {
"invalid_yaml": "Service YAML contains syntax errors, please fix the syntax",
"no_service": "No service defined, please define a service: key",
"invalid_service": "Defined service is invalid, please provide a service in the format domain.service",
"no_target": "This service requires a target, please define a target entity_id, device_id, or area_id under target: or data:",
"missing_required_field": "This service requires field {key}, which must be provided under data:"
"invalid_yaml": "Action YAML contains syntax errors, please fix the syntax",
"no_service": "No action defined, please define an action: key",
"invalid_service": "Defined action is invalid, please provide an action in the format domain.action",
"no_target": "This action requires a target, please define a target entity_id, device_id, or area_id under target: or data:",
"missing_required_field": "This action requires field {key}, which must be provided under data:"
}
}
},