diff --git a/nodes/core/analysis/72-sentiment.html b/nodes/core/analysis/72-sentiment.html index 78a6ee024..f2912aa87 100644 --- a/nodes/core/analysis/72-sentiment.html +++ b/nodes/core/analysis/72-sentiment.html @@ -17,7 +17,7 @@ @@ -40,7 +40,7 @@ outputs:1, icon: "arrow-in.png", label: function() { - return this.name||this._("sentiment.label.sentimentlabel"); + return this.name||this._("sentiment.sentiment"); }, labelStyle: function() { return this.name?"node_label_italic":""; diff --git a/nodes/core/core/20-inject.html b/nodes/core/core/20-inject.html index 19ff73597..ce70a9714 100644 --- a/nodes/core/core/20-inject.html +++ b/nodes/core/core/20-inject.html @@ -122,7 +122,7 @@
- +
@@ -494,13 +494,13 @@ }, error: function(jqXHR,textStatus,errorThrown) { if (jqXHR.status == 404) { - RED.notify(node._("inject.error",{message:node._("inject.errors.not-deployed")}),"error"); + RED.notify(node._("common.notification.error",{message:node._("common.notification.errors.not-deployed")}),"error"); } else if (jqXHR.status == 500) { - RED.notify(node._("inject.error",{message:node._("inject.errors.failed")}),"error"); + RED.notify(node._("common.notification.error",{message:node._("inject.errors.failed")}),"error"); } else if (jqXHR.status == 0) { - RED.notify(node._("inject.error",{message:node._("inject.errors.no-response")}),"error"); + RED.notify(node._("common.notification.error",{message:node._("common.notification.errors.no-response")}),"error"); } else { - RED.notify(node._("inject.error",{message:node._("inject.errors.not-deployed",{status:jqXHR.status,message:textStatus})}),"error"); + RED.notify(node._("common.notification.error",{message:node._("common.notification.errors.unexpected",{status:jqXHR.status,message:textStatus})}),"error"); } } }); diff --git a/nodes/core/core/25-catch.html b/nodes/core/core/25-catch.html index ffc28e3db..8f3572727 100644 --- a/nodes/core/core/25-catch.html +++ b/nodes/core/core/25-catch.html @@ -17,7 +17,7 @@ @@ -103,23 +103,24 @@ toggle: "active", onclick: function() { var label = this.name||"debug"; + var node = this; $.ajax({ url: "debug/"+this.id+"/"+(this.active?"enable":"disable"), type: "POST", success: function(resp, textStatus, xhr) { if (xhr.status == 200) { - RED.notify("Successfully activated: "+label,"success"); + RED.notify(node._("debug.notification.activated",{label:label}),"success"); } else if (xhr.status == 201) { - RED.notify("Successfully deactivated: "+label,"success"); + RED.notify(node._("debug.notification.deactivated",{label:label}),"success"); } }, error: function(jqXHR,textStatus,errorThrown) { if (jqXHR.status == 404) { - RED.notify("Error: debug node not deployed","error"); + RED.notify(node._("common.notification.error", {message: node._("common.notification.errors.not-deployed")}),"error"); } else if (jqXHR.status == 0) { - RED.notify("Error: no response from server","error"); + RED.notify(node._("common.notification.error", {message: node._("common.notification.errors.no-response")}),"error"); } else { - RED.notify("Error: unexpected error: ("+err.status+") "+err.response,"error"); + RED.notify(node._("common.notification.error",{message:node._("common.notification.errors.unexpected",{status:err.status,message:err.response})}),"error"); } } }); diff --git a/nodes/core/core/75-exec.html b/nodes/core/core/75-exec.html index 34b499045..808b269d3 100644 --- a/nodes/core/core/75-exec.html +++ b/nodes/core/core/75-exec.html @@ -16,17 +16,17 @@ diff --git a/nodes/core/core/80-function.html b/nodes/core/core/80-function.html index 0af9b1b5c..0c2d0792e 100644 --- a/nodes/core/core/80-function.html +++ b/nodes/core/core/80-function.html @@ -17,10 +17,10 @@ diff --git a/nodes/core/core/89-delay.html b/nodes/core/core/89-delay.html index 44aa08790..2d2172a6f 100644 --- a/nodes/core/core/89-delay.html +++ b/nodes/core/core/89-delay.html @@ -69,7 +69,7 @@
- +
diff --git a/nodes/core/core/89-trigger.html b/nodes/core/core/89-trigger.html index 70f3a85c6..b610704c7 100644 --- a/nodes/core/core/89-trigger.html +++ b/nodes/core/core/89-trigger.html @@ -58,7 +58,7 @@
- +
diff --git a/nodes/core/core/90-comment.html b/nodes/core/core/90-comment.html index 785a34a2a..eb049b9e9 100644 --- a/nodes/core/core/90-comment.html +++ b/nodes/core/core/90-comment.html @@ -17,7 +17,7 @@ diff --git a/nodes/core/io/10-mqtt.html b/nodes/core/io/10-mqtt.html index 1309482b6..b0b94f647 100644 --- a/nodes/core/io/10-mqtt.html +++ b/nodes/core/io/10-mqtt.html @@ -21,11 +21,11 @@
- +
- +
@@ -63,7 +63,7 @@
- +
@@ -81,7 +81,7 @@
- +
@@ -120,12 +120,12 @@
- - + +
- +
diff --git a/nodes/core/io/21-httpin.html b/nodes/core/io/21-httpin.html index db1cef0a1..b6e848f77 100644 --- a/nodes/core/io/21-httpin.html +++ b/nodes/core/io/21-httpin.html @@ -26,17 +26,17 @@
- +
- +
-
.
+
.
@@ -140,7 +140,7 @@ function ws_validateclient() {
- +
@@ -183,7 +183,7 @@ function ws_validateclient() { @@ -242,7 +242,7 @@ function ws_validateclient() { diff --git a/nodes/core/io/23-watch.html b/nodes/core/io/23-watch.html index f897de39e..1acbea2aa 100644 --- a/nodes/core/io/23-watch.html +++ b/nodes/core/io/23-watch.html @@ -21,7 +21,7 @@
- +
diff --git a/nodes/core/io/31-tcpin.html b/nodes/core/io/31-tcpin.html index 08bdf2f31..1504dd635 100644 --- a/nodes/core/io/31-tcpin.html +++ b/nodes/core/io/31-tcpin.html @@ -48,11 +48,11 @@
- +
- +
@@ -143,7 +143,7 @@
- +
- +
@@ -141,7 +141,7 @@
- +
diff --git a/nodes/core/locales/en-US/messages.json b/nodes/core/locales/en-US/messages.json index b7f1f6f4b..6c5db4060 100644 --- a/nodes/core/locales/en-US/messages.json +++ b/nodes/core/locales/en-US/messages.json @@ -3,9 +3,7 @@ "label": { "payload": "Payload", "topic": "Topic", - "topicph": "topic", "name": "Name", - "nameph": "name", "username": "Username", "password": "Password" }, @@ -35,6 +33,14 @@ "noconnection": "no connection", "tweeting": "tweeting", "failed": "failed" + }, + "notification": { + "error": "Error: __message__", + "errors": { + "not-deployed": "node not deployed", + "no-response": "no response from server", + "unexpected": "unexpected error (__status__) __message__" + } } }, "inject": { @@ -75,10 +81,7 @@ "success": "Successfully injected: __label__", "error": "Error: __message__", "errors": { - "not-deployed": "inject node not deployed", - "failed": "inject failed, see log for details", - "no-response": "no response from server", - "unexpected": "unexpected error (__status__) __message__" + "failed": "inject failed, see log for details" } }, "catch": { @@ -91,29 +94,37 @@ "msgobj": "complete msg object", "to": "to", "debtab": "debug tab", - "tabcon": "debug tab and console" + "tabcon": "debug tab and console", + "notification": { + "activated": "Successfully activated: __label__", + "deactivated": "Successfully deactivated: __label__" + } }, "exec": { - "exec": "exec", "spawnerr": "Spawn command must be just the command - no spaces or extra parameters", "badstdout": "Bad STDOUT", - "command": "Command", - "commandph": "command", - "append": "Append", - "extraparams": "extra input parameters", + "label": { + "command": "Command", + "append": "Append" + }, + "placeholder": { + "extraparams": "extra input parameters" + }, "spawn": "Use spawn() instead of exec() ?", "tip": "Tip: spawn expects only one command word - and appended args to be comma separated." }, "function": { - "function": "function", - "functionlabel": "Function", - "outputs": "Outputs", + "label": { + "function": "Function", + "outputs": "Outputs" + }, "tip": "See the Info tab for help writing functions." }, "template": { - "template": "template", - "templatelabel": "Template", - "property": "Property", + "label": { + "template": "Template", + "property": "Property" + }, "templatevalue": "This is the payload: {{payload}} !" }, "delay": { @@ -169,7 +180,6 @@ "body": "Body - will be rendered in info tab.", "tip1": "Tip: The text here can be styled as ", "tip2": "Github flavoured Markdown", - "commentph": "comment", "commentnode": "Comment node", "commentinfo": "Use this node to add simple documentation.\n\nAnything you add will be rendered in this info panel.\n\nYou may use Markdown syntax to **enhance** the *presentation*." }, @@ -186,14 +196,15 @@ "broker": "Broker", "qos": "QoS", "clientid": "Client ID", - "clientidph": "Leave blank for auto generated" + "port": "Port" + }, + "placeholder": { + "clientid": "Leave blank for auto generated" }, "retain": "Retain", "true": "true", "false": "false", "tip": "Tip: Leave topic, qos or retain blank if you want to set them via msg properties.", - "port": "Port", - "portph": "port", "errors": { "not-defined": "topic not defined", "missing-config": "missing broker configuration", @@ -201,13 +212,10 @@ } }, "httpin": { - "httpin": "httpin", "label": { "method": "Method", "url": "URL", - "urlph": "/url", - "httpph": "http://", - "doc": "Doc", + "doc": "Documentation", "return": "Return" }, "setby": "- set by msg.method -", @@ -215,9 +223,11 @@ "utf8": "a UTF-8 string", "binary": "a binary buffer", "json": "a parsed JSON object", - "in-tip": "The url will be relative to ", - "res-tip": "The messages sent to this node must originate from an http input node", - "req-tip": "Tip: If the JSON parse fails the fetched string is returned as-is.", + "tip": { + "in": "The url will be relative to ", + "res": "The messages sent to this node must originate from an http input node", + "req": "Tip: If the JSON parse fails the fetched string is returned as-is." + }, "httpreq": "http request", "errors": { "not-created": "Cannot create http-in node when httpNodeRoot set to false", @@ -232,18 +242,18 @@ "label": { "type": "Type", "path": "Path", - "url": "URL", - "pathph": "/ws/example", - "urlph": "ws://example.com/ws" + "url": "URL" }, "listenon": "Listen on", "connectto": "Connect to", "payload": "Send/Receive payload", "message": "Send/Receive entire message", - "path-tip1": "By default, payload will contain the data to be sent over, or received from a websocket. The listener can be configured to send or receive the entire message object as a JSON formatted string.", - "path-tip2": "This path will be relative to ", - "url-tip1": "URL should use ws:// or wss:// scheme and point to an existing websocket listener.", - "url-tip2": "By default, payload will contain the data to be sent over, or received from a websocket. The client can be configured to send or receive the entire message object as a JSON formatted string.", + "tip": { + "path1": "By default, payload will contain the data to be sent over, or received from a websocket. The listener can be configured to send or receive the entire message object as a JSON formatted string.", + "path2": "This path will be relative to ", + "url1": "URL should use ws:// or wss:// scheme and point to an existing websocket listener.", + "url2": "By default, payload will contain the data to be sent over, or received from a websocket. The client can be configured to send or receive the entire message object as a JSON formatted string." + }, "errors": { "connect-error": "An error occured on the ws connection: ", "send-error": "An error occurred while sending: ", @@ -510,10 +520,7 @@ } }, "sentiment": { - "sentiment": "sentiment", - "label": { - "sentimentlabel": "sentiment" - } + "sentiment": "sentiment" }, "arduino": { "arduino": "arduino", @@ -521,8 +528,10 @@ "arduino": "Arduino", "pin": "Pin", "type": "Type", - "port": "Port", - "portph": "e.g. /dev/ttyUSB0 COM1" + "port": "Port" + }, + "placeholder": { + "port": "e.g. /dev/ttyUSB0 COM1" }, "digitalpin": "Digital pin", "analoguepin": "Analogue pin", diff --git a/nodes/core/logic/10-switch.html b/nodes/core/logic/10-switch.html index 1640c2e1f..2fa6c73d3 100644 --- a/nodes/core/logic/10-switch.html +++ b/nodes/core/logic/10-switch.html @@ -17,7 +17,7 @@ diff --git a/nodes/core/parsers/70-CSV.html b/nodes/core/parsers/70-CSV.html index 4adc256fc..bf4f89295 100644 --- a/nodes/core/parsers/70-CSV.html +++ b/nodes/core/parsers/70-CSV.html @@ -36,7 +36,7 @@
- +
diff --git a/nodes/core/parsers/70-HTML.html b/nodes/core/parsers/70-HTML.html index bc840e85d..997e43470 100644 --- a/nodes/core/parsers/70-HTML.html +++ b/nodes/core/parsers/70-HTML.html @@ -38,7 +38,7 @@
- +
diff --git a/nodes/core/parsers/70-JSON.html b/nodes/core/parsers/70-JSON.html index 07642bfa3..4bf92473d 100644 --- a/nodes/core/parsers/70-JSON.html +++ b/nodes/core/parsers/70-JSON.html @@ -17,7 +17,7 @@ diff --git a/nodes/core/parsers/70-XML.html b/nodes/core/parsers/70-XML.html index b4269fc3f..2671e68fb 100644 --- a/nodes/core/parsers/70-XML.html +++ b/nodes/core/parsers/70-XML.html @@ -17,7 +17,7 @@ diff --git a/nodes/core/storage/50-file.html b/nodes/core/storage/50-file.html index c7d9f2e6a..98c26d1d1 100644 --- a/nodes/core/storage/50-file.html +++ b/nodes/core/storage/50-file.html @@ -17,7 +17,7 @@ @@ -49,7 +49,7 @@