frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2025-03-01 10:36:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resolve merge conflict

Browse Source
This commit is contained in:
Hiroyasu Nishiyama
2022-12-27 23:45:25 +09:00
parent 2ab8121a4a 270eb56718
commit 99bd957ea0
26 changed files with 549 additions and 324 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/node_modules/@node-red/nodes/locales/en-US/function/16-range.html vendored
View File

@@ -34,11 +34,14 @@
the range specified within the target range.</p>
<p><i>Scale and wrap within the target range</i> means that the result will
be wrapped within the target range.</p>
<p><i>Scale, but drop if outside input range</i> means that the result will
be scaled, but any inputs outside of the inout range will be dropped.</p>
<p>For example an input 0 - 10 mapped to 0 - 100.</p>
<table style="outline-width:#888 solid thin">
<tr><th width="80px">mode</th><th width="80px">input</th><th width="80px">output</th></tr>
<tr><td><center>scale</center></td><td><center>12</center></td><td><center>120</center></td></tr>
<tr><td><center>limit</center></td><td><center>12</center></td><td><center>100</center></td></tr>
<tr><td><center>wrap</center></td><td><center>12</center></td><td><center>20</center></td></tr>
<tr><td><center>drop</center></td><td><center>12</center></td><td><center><i>(no output)</i></center></td></tr>
</table>
</script>

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

@@ -813,7 +813,8 @@
"scale": {
"payload": "Scale the message property",
"limit": "Scale and limit to the target range",
"wrap": "Scale and wrap within the target range"
"wrap": "Scale and wrap within the target range",
"drop": "Scale, but drop msg if outside input range"
},
"tip": "Tip: This node ONLY works with numbers.",
"errors": {

1
packages/node_modules/@node-red/nodes/locales/en-US/parsers/70-CSV.html vendored
View File

@@ -47,5 +47,6 @@
<p>If 'include null values' option is checked, null values will be returned in result, ie. middle value '"1",,3'.</p>
<p>The node can accept a multi-part input as long as the <code>parts</code> property is set correctly, for example from a file-in node or split node.</p>
<p>If outputting multiple messages they will have their <code>parts</code> property set and form a complete message sequence.</p>
<p>If the node is set to only send column headers once, then setting <code>msg.reset</code> to any value will cause the node to resend the headers.</p>
<p><b>Note:</b> the column template must be comma separated - even if a different separator is chosen for the data.</p>
</script>

7
packages/node_modules/@node-red/nodes/locales/ja/messages.json vendored
View File

@@ -777,8 +777,8 @@
"change": "値の置換",
"delete": "値の削除",
"move": "値の移動",
"toValue": "対象の値",
"to": "対象の値",
"toValue": "代入する値",
"to": "移動先",
"search": "検索する文字列",
"replace": "置換後の文字列"
},
@@ -813,7 +813,8 @@
"scale": {
"payload": "msg.payloadの値を拡大/縮小",
"limit": "入力値の範囲外の値を最小値/最大値とし拡大/縮小",
"wrap": "入力値の範囲外の値を範囲幅で割った余りとし拡大/縮小"
"wrap": "入力値の範囲外の値を範囲幅で割った余りとし拡大/縮小",
"drop": "値を拡大/縮小(入力範囲外の時はメッセージを削除)"
},
"tip": "注釈: 本ノードは、数値のみ扱うことができます。",
"errors": {