Fixes to script localization (#3930)

* Fixes

* fix toast
This commit is contained in:
Bram Kragten 2019-10-04 21:46:32 +02:00 committed by GitHub
parent ba79633758
commit 848dd7e071
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 11 deletions

View File

@ -100,10 +100,7 @@ class HaScriptEditor extends LocalizeMixin(NavigateMixin(PolymerElement)) {
<ha-paper-icon-button-arrow-prev
on-click="backTapped"
></ha-paper-icon-button-arrow-prev>
<div main-title>
[[localize('ui.panel.config.script.caption'), 'name',
computeName(script)]]
</div>
<div main-title>[[computeHeader(script)]]</div>
<template is="dom-if" if="[[!creatingNew]]">
<paper-icon-button
icon="hass:delete"
@ -261,7 +258,9 @@ class HaScriptEditor extends LocalizeMixin(NavigateMixin(PolymerElement)) {
if (
this.dirty &&
// eslint-disable-next-line
!confirm(this.hass.localize("ui.panel.config.common.editor.confirm_unsaved"))
!confirm(
this.hass.localize("ui.panel.config.common.editor.confirm_unsaved")
)
) {
return;
}
@ -318,8 +317,14 @@ class HaScriptEditor extends LocalizeMixin(NavigateMixin(PolymerElement)) {
);
}
computeName(script) {
return script && computeStateName(script);
computeHeader(script) {
return script
? this.hass.localize(
"ui.panel.config.script.editor.header",
"name",
computeStateName(script)
)
: this.hass.localize("ui.panel.config.script.editor.default_name");
}
_computeRTL(hass) {

View File

@ -113,11 +113,11 @@ class HaScriptPicker extends LitElement {
const script = ev.currentTarget.script as HassEntity;
await triggerScript(this.hass, script.entity_id);
showToast(this, {
message: `${this.hass.localize(
"ui.dialogs.notification_toast.triggered",
message: this.hass.localize(
"ui.notification_toast.triggered",
"name",
computeStateName(script)
)}`,
),
});
}

View File

@ -905,7 +905,7 @@
}
},
"script": {
"caption": "Script {name}",
"caption": "Script",
"description": "Create and edit scripts",
"picker": {
"header": "Script Editor",
@ -916,6 +916,7 @@
"add_script": "Add script"
},
"editor": {
"header": "Script: {name}",
"default_name": "New Script",
"load_error_not_editable": "Only scripts inside scripts.yaml are editable.",
"delete_confirm": "Are you sure you want to delete this script?"