updates from feedback

home-assistant · May 8, 2024 · 0386655 · 0386655
1 parent 5aa8cc9
commit 0386655
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/src/data/script_i18n.ts b/src/data/script_i18n.ts
@@ -194,9 +194,10 @@ const tryDescribeAction = <T extends ActionType>(
       (config.service && isTemplate(config.service))
     ) {
       return hass.localize(
-        `${actionTranslationBaseKey}.service.description.service_based_on_template`,
+        targets.length
+          ? `${actionTranslationBaseKey}.service.description.service_based_on_template`
+          : `${actionTranslationBaseKey}.service.description.service_based_on_template_no_targets`,
         {
-          hasTargets: targets.length ? "true" : "false",
           targets: formatListWithAnds(hass.locale, targets),
         }
       );
@@ -210,23 +211,25 @@ const tryDescribeAction = <T extends ActionType>(
 
       if (config.metadata) {
         return hass.localize(
-          `${actionTranslationBaseKey}.service.description.service_name`,
+          targets.length
+            ? `${actionTranslationBaseKey}.service.description.service_name`
+            : `${actionTranslationBaseKey}.service.description.service_name_no_targets`,
           {
             domain: domainToName(hass.localize, domain),
             name: service || config.service,
-            hasTargets: targets.length ? "true" : "false",
             targets: formatListWithAnds(hass.locale, targets),
           }
         );
       }
 
       return hass.localize(
-        `${actionTranslationBaseKey}.service.description.service_based_on_name`,
+        targets.length
+          ? `${actionTranslationBaseKey}.service.description.service_based_on_name`
+          : `${actionTranslationBaseKey}.service.description.service_based_on_name_no_targets`,
         {
           name: service
             ? `${domainToName(hass.localize, domain)}: ${service}`
             : config.service,
-          hasTargets: targets.length ? "true" : "false",
           targets: formatListWithAnds(hass.locale, targets),
         }
       );

diff --git a/src/translations/en.json b/src/translations/en.json
@@ -3248,9 +3248,12 @@
                   "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",
                   "description": {
-                    "service_based_on_template": "Call a service based on a template{hasTargets, select, \n true { on {targets}} \n other {} \n }",
-                    "service_based_on_name": "Call a service ''{name}''{hasTargets, select, \n true { on {targets}} \n other {} \n }",
-                    "service_name": "{domain} ''{name}''{hasTargets, select, \n true { on {targets}} \n other {} \n }",
+                    "service_based_on_template": "Call a service based on a template on {targets}",
+                    "service_based_on_name": "Call a service ''{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_name_no_targets": "{domain} ''{name}''",
                     "service": "Call a service",
                     "target_template": "templated {name}",
                     "target_unknown_entity": "unknown entity",