1
0
mirror of https://github.com/node-red/node-red.git synced 2023-10-10 13:36:53 +02:00

Merge branch 'dev' of github.com:node-red/node-red into dev

This commit is contained in:
Nick O'Leary 2021-06-29 14:01:12 +01:00
commit 21b602650c
No known key found for this signature in database
GPG Key ID: 4F2157149161A6C9
3 changed files with 15 additions and 2 deletions

View File

@ -276,8 +276,17 @@
inputs:1, inputs:1,
outputs:1, outputs:1,
outputLabels: function(i) { outputLabels: function(i) {
var l = this._(((this.format === "utf8")||(this.format === "lines")) ? "file.label.utf8String" : "file.label.binaryBuffer"); var l;
return ( l + (((this.format === "lines")||(this.format === "stream")) ? "s" : "") ); if (this.format === "utf8") {
l = "file.label.utf8String";
} else if (this.format === "lines") {
l = "file.label.utf8String_plural";
} else if (this.format === "stream") {
l = "file.label.binaryBuffer_plural";
} else {
l = "file.label.binaryBuffer";
}
return this._(l);
}, },
icon: "file-in.svg", icon: "file-in.svg",
label: function() { label: function() {

View File

@ -861,7 +861,9 @@
"encoding": "Encoding", "encoding": "Encoding",
"deletelabel": "delete __file__", "deletelabel": "delete __file__",
"utf8String": "UTF8 string", "utf8String": "UTF8 string",
"utf8String_plural": "UTF8 strings",
"binaryBuffer": "binary buffer", "binaryBuffer": "binary buffer",
"binaryBuffer_plural": "binary buffers",
"allProps": "include all existing properties in each msg" "allProps": "include all existing properties in each msg"
}, },
"action": { "action": {

View File

@ -859,7 +859,9 @@
"encoding": "文字コード", "encoding": "文字コード",
"deletelabel": "delete __file__", "deletelabel": "delete __file__",
"utf8String": "UTF8文字列", "utf8String": "UTF8文字列",
"utf8String_plural": "UTF8文字列",
"binaryBuffer": "バイナリバッファ", "binaryBuffer": "バイナリバッファ",
"binaryBuffer_plural": "バイナリバッファ",
"allProps": "各メッセージに既存の全プロパティを含める" "allProps": "各メッセージに既存の全プロパティを含める"
}, },
"action": { "action": {