From 848dd7e071ad3ff28396ca8c87398a97128c964b Mon Sep 17 00:00:00 2001
From: Bram Kragten <mail@bramkragten.nl>
Date: Fri, 4 Oct 2019 21:46:32 +0200
Subject: [PATCH] Fixes to script localization (#3930)

* Fixes

* fix toast
---
 src/panels/config/script/ha-script-editor.js | 19 ++++++++++++-------
 src/panels/config/script/ha-script-picker.ts |  6 +++---
 src/translations/en.json                     |  3 ++-
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/panels/config/script/ha-script-editor.js b/src/panels/config/script/ha-script-editor.js
index fc55899406..9f14af1c1b 100644
--- a/src/panels/config/script/ha-script-editor.js
+++ b/src/panels/config/script/ha-script-editor.js
@@ -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) {
diff --git a/src/panels/config/script/ha-script-picker.ts b/src/panels/config/script/ha-script-picker.ts
index 051a331fd5..17d5134c4f 100644
--- a/src/panels/config/script/ha-script-picker.ts
+++ b/src/panels/config/script/ha-script-picker.ts
@@ -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)
-      )}`,
+      ),
     });
   }
 
diff --git a/src/translations/en.json b/src/translations/en.json
index bec095541b..5f7759f5c8 100644
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -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?"