frodovdr
/
node-red
mirror of https://github.com/node-red/node-red.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #4207 from node-red/4197-status-catch-label 

Update status and catch node labels in group mode
This commit is contained in:
Nick O'Leary 2023-06-21 13:27:09 +01:00 committed by GitHub
parent fb5b470966 f8175fc325
commit e90007860c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/node_modules/@node-red/nodes/core/common/25-catch.html vendored
View File

@ -41,7 +41,9 @@
if (this.name) { if (this.name) {
return 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._("catch.catchNodes",{number:this.scope.length});
} }
return this.uncaught?this._("catch.catchUncaught"):this._("catch.catch") return this.uncaught?this._("catch.catchUncaught"):this._("catch.catch")

10
packages/node_modules/@node-red/nodes/core/common/25-status.html vendored
View File

@ -33,7 +33,15 @@
outputs:1, outputs:1,
icon: "status.svg", icon: "status.svg",
label: function() { 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() { labelStyle: function() {
return this.name?"node_label_italic":""; return this.name?"node_label_italic":"";

2
packages/node_modules/@node-red/nodes/locales/en-US/messages.json vendored
View File

@ -94,6 +94,7 @@
}, },
"catch": { "catch": {
"catch": "catch: all", "catch": "catch: all",
"catchGroup": "catch: group",
"catchNodes": "catch: __number__", "catchNodes": "catch: __number__",
"catchUncaught": "catch: uncaught", "catchUncaught": "catch: uncaught",
"label": { "label": {
@ -109,6 +110,7 @@
}, },
"status": { "status": {
"status": "status: all", "status": "status: all",
"statusGroup": "status: group",
"statusNodes": "status: __number__", "statusNodes": "status: __number__",
"label": { "label": {
"source": "Report status from", "source": "Report status from",