From aa0225f59fcc294984322dcd05e7f62b7fafa0ac Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Wed, 21 Jun 2023 14:27:32 +0100
Subject: [PATCH] Apply suggestions from code review

---
 .../@node-red/nodes/core/function/10-function.html          | 6 +++---
 .../@node-red/nodes/core/function/10-function.js            | 2 +-
 .../node_modules/@node-red/nodes/locales/de/messages.json   | 2 +-
 .../@node-red/nodes/locales/en-US/messages.json             | 2 +-
 .../node_modules/@node-red/nodes/locales/ru/messages.json   | 2 +-
 test/nodes/core/function/10-function_spec.js                | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/core/function/10-function.html b/packages/node_modules/@node-red/nodes/core/function/10-function.html
index 8130be2ad..581c58c73 100644
--- a/packages/node_modules/@node-red/nodes/core/function/10-function.html
+++ b/packages/node_modules/@node-red/nodes/core/function/10-function.html
@@ -84,7 +84,7 @@
 
             <div class="form-row">
                 <label for="node-input-timeout"><i class="fa fa-clock"></i> <span data-i18n="function.label.timeout"></span></label>
-                <input id="node-input-timeout" style="width: 60px;" value="1000">
+                <input id="node-input-timeout" style="width: 60px;" data-i18n="[placeholder]join.seconds">
             </div>
 
             <div class="form-row node-input-libs-row hide" style="margin-bottom: 0px;">
@@ -470,10 +470,10 @@
                 }
             });
 
-            // 4294967295 is max in node.js timeout.
+            // 4294967 is max in node.js timeout.
             $( "#node-input-timeout" ).spinner({
                 min: 0,
-                max: 4294967294,
+                max: 4294967,
                 change: function(event, ui) {
                     var value = this.value;
                     if(value == ""){
diff --git a/packages/node_modules/@node-red/nodes/core/function/10-function.js b/packages/node_modules/@node-red/nodes/core/function/10-function.js
index 3ada08943..662b7fa47 100644
--- a/packages/node_modules/@node-red/nodes/core/function/10-function.js
+++ b/packages/node_modules/@node-red/nodes/core/function/10-function.js
@@ -96,7 +96,7 @@ module.exports = function(RED) {
         node.name = n.name;
         node.func = n.func;
         node.outputs = n.outputs;
-        node.timeout = n.timeout*1;
+        node.timeout = n.timeout*1000;
         if(node.timeout>0){
             node.timeoutOptions = {
                 timeout:node.timeout,
diff --git a/packages/node_modules/@node-red/nodes/locales/de/messages.json b/packages/node_modules/@node-red/nodes/locales/de/messages.json
index 0b98bd927..bc706e1f1 100644
--- a/packages/node_modules/@node-red/nodes/locales/de/messages.json
+++ b/packages/node_modules/@node-red/nodes/locales/de/messages.json
@@ -217,7 +217,7 @@
             "finalize": "Stopp",
             "outputs": "Ausgänge",
             "modules": "Module",
-            "timeout": "Timeout (ms)"
+            "timeout": "Timeout"
         },
         "text": {
             "initialize": "// Der Code hier wird ausgeführt,\n// wenn der Node gestartet wird\n",
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 5e47a7960..a7b583878 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
@@ -253,7 +253,7 @@
             "finalize": "On Stop",
             "outputs": "Outputs",
             "modules": "Modules",
-            "timeout": "Timeout (ms)"
+            "timeout": "Timeout"
         },
         "text": {
             "initialize": "// Code added here will be run once\n// whenever the node is started.\n",
diff --git a/packages/node_modules/@node-red/nodes/locales/ru/messages.json b/packages/node_modules/@node-red/nodes/locales/ru/messages.json
index 0fac5118e..58ccf90fe 100644
--- a/packages/node_modules/@node-red/nodes/locales/ru/messages.json
+++ b/packages/node_modules/@node-red/nodes/locales/ru/messages.json
@@ -213,7 +213,7 @@
             "initialize": "Настройка",
             "finalize": "Закрытие",
             "outputs": "Выходы",
-            "timeout":"Время ожидания (мс)"
+            "timeout":"Время ожидания"
         },
         "text": {
             "initialize": "// Добавленный здесь код будет исполняться\n// однократно при развертывании узла.\n",
diff --git a/test/nodes/core/function/10-function_spec.js b/test/nodes/core/function/10-function_spec.js
index e5b689136..99557f0b3 100644
--- a/test/nodes/core/function/10-function_spec.js
+++ b/test/nodes/core/function/10-function_spec.js
@@ -1425,7 +1425,7 @@ describe('function node', function() {
     });
 
     it('should timeout if timeout is set', function(done) {
-        var flow = [{id:"n1",type:"function",wires:[["n2"]],timeout:"10",func:"while(1==1){};\nreturn msg;"}];
+        var flow = [{id:"n1",type:"function",wires:[["n2"]],timeout:"0.010",func:"while(1==1){};\nreturn msg;"}];
         helper.load(functionNode, flow, function() {
             var n1 = helper.getNode("n1");
             n1.receive({payload:"foo",topic: "bar"});