From a78da0db1e61ae64ebd432b2ca6cce7ecdd288ee Mon Sep 17 00:00:00 2001
From: Steve-Mcl <sdmclaughlin@gmail.com>
Date: Mon, 29 May 2023 22:47:29 +0100
Subject: [PATCH] Update status and catch node labels in group mode

---
 .../@node-red/nodes/core/common/25-catch.html          |  4 +++-
 .../@node-red/nodes/core/common/25-status.html         | 10 +++++++++-
 .../@node-red/nodes/locales/en-US/messages.json        |  2 ++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/core/common/25-catch.html b/packages/node_modules/@node-red/nodes/core/common/25-catch.html
index fe68b46db..4b92c9758 100644
--- a/packages/node_modules/@node-red/nodes/core/common/25-catch.html
+++ b/packages/node_modules/@node-red/nodes/core/common/25-catch.html
@@ -41,7 +41,9 @@
             if (this.name) {
                 return this.name;
             }
-            if (this.scope) {
+            if (this.scope === "group") {
+                return this._("catch.catchGroup");
+            } else if (Array.isArray(this.scope)) {
                 return this._("catch.catchNodes",{number:this.scope.length});
             }
             return this.uncaught?this._("catch.catchUncaught"):this._("catch.catch")
diff --git a/packages/node_modules/@node-red/nodes/core/common/25-status.html b/packages/node_modules/@node-red/nodes/core/common/25-status.html
index 0efdede33..b5efadeac 100644
--- a/packages/node_modules/@node-red/nodes/core/common/25-status.html
+++ b/packages/node_modules/@node-red/nodes/core/common/25-status.html
@@ -33,7 +33,15 @@
         outputs:1,
         icon: "status.svg",
         label: function() {
-            return this.name||(this.scope?this._("status.statusNodes",{number:this.scope.length}):this._("status.status"));
+            if (this.name) {
+                return this.name;
+            }
+            if (this.scope === "group") {
+                return this._("status.statusGroup");
+            } else if (Array.isArray(this.scope)) {
+                return this._("status.statusNodes",{number:this.scope.length});
+            }
+            return this._("status.status")
         },
         labelStyle: function() {
             return this.name?"node_label_italic":"";
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/messages.json b/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
index 52fd1455d..673440b8f 100644
--- a/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
@@ -94,6 +94,7 @@
     },
     "catch": {
         "catch": "catch: all",
+        "catchGroup": "catch: in same group",
         "catchNodes": "catch: __number__",
         "catchUncaught": "catch: uncaught",
         "label": {
@@ -109,6 +110,7 @@
     },
     "status": {
         "status": "status: all",
+        "statusGroup": "status: in same group",
         "statusNodes": "status: __number__",
         "label": {
             "source": "Report status from",