From 61f6535be817f9a7b0c1266f11e5cce01fb55c1c Mon Sep 17 00:00:00 2001 From: HirokiUchikawa Date: Wed, 23 May 2018 16:54:03 +0900 Subject: [PATCH 01/34] Add test case for preventing following redirect --- test/nodes/core/io/21-httprequest_spec.js | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/test/nodes/core/io/21-httprequest_spec.js b/test/nodes/core/io/21-httprequest_spec.js index 43c42c8a4..4a1b513f0 100644 --- a/test/nodes/core/io/21-httprequest_spec.js +++ b/test/nodes/core/io/21-httprequest_spec.js @@ -796,6 +796,25 @@ describe('HTTP Request Node', function() { }); }); + it('should prevent following redirect when msg.followRedirects is false', function(done) { + var flow = [{id:"n1",type:"http request",wires:[["n2"]],method:"GET",ret:"txt",url:getTestURL('/redirectToText')}, + {id:"n2", type:"helper"}]; + helper.load(httpRequestNode, flow, function() { + var n1 = helper.getNode("n1"); + var n2 = helper.getNode("n2"); + n2.on("input", function(msg) { + try { + msg.should.have.property('statusCode',302); + msg.should.have.property('responseUrl', getTestURL('/redirectToText')); + done(); + } catch(err) { + done(err); + } + }); + n1.receive({payload:"foo",followRedirects:false}); + }); + }); + it('shuold output an error when request timeout occurred', function(done) { var flow = [{id:"n1",type:"http request",wires:[["n2"]],method:"GET",ret:"obj",url:getTestURL('/timeout')}, {id:"n2", type:"helper"}]; From 9fd5d1db56a6b25a5342b55cd893a5f180e07909 Mon Sep 17 00:00:00 2001 From: HirokiUchikawa Date: Wed, 23 May 2018 17:16:20 +0900 Subject: [PATCH 02/34] Move to request module --- nodes/core/io/21-httprequest.js | 146 ++++++++-------------- package.json | 2 +- test/nodes/core/io/21-httprequest_spec.js | 8 +- 3 files changed, 63 insertions(+), 93 deletions(-) diff --git a/nodes/core/io/21-httprequest.js b/nodes/core/io/21-httprequest.js index b492fb9dc..4ddb1d3b9 100644 --- a/nodes/core/io/21-httprequest.js +++ b/nodes/core/io/21-httprequest.js @@ -16,9 +16,7 @@ module.exports = function(RED) { "use strict"; - var http = require("follow-redirects").http; - var https = require("follow-redirects").https; - var urllib = require("url"); + var request = require("request"); var mustache = require("mustache"); var querystring = require("querystring"); var cookie = require("cookie"); @@ -78,9 +76,13 @@ module.exports = function(RED) { if (msg.method && n.method && (n.method === "use")) { method = msg.method.toUpperCase(); // use the msg parameter } - var opts = urllib.parse(url); + var opts = {}; + opts.url = url; + opts.timeout = node.reqTimeout; opts.method = method; opts.headers = {}; + opts.encoding = null; // Force NodeJs to return a Buffer (instead of a string) + opts.maxRedirects = 21; var ctSet = "Content-Type"; // set default camel case var clSet = "Content-Length"; if (msg.headers) { @@ -109,7 +111,7 @@ module.exports = function(RED) { } } if (msg.hasOwnProperty('followRedirects')) { - opts.followRedirects = msg.followRedirects; + opts.followRedirect = msg.followRedirects; } if (msg.cookies) { var cookies = []; @@ -134,7 +136,10 @@ module.exports = function(RED) { } } if (this.credentials && this.credentials.user) { - opts.auth = this.credentials.user+":"+(this.credentials.password||""); + opts.auth = { + user: this.credentials.user, + pass: this.credentials.password||"" + }; } var payload = null; @@ -160,6 +165,7 @@ module.exports = function(RED) { opts.headers[clSet] = Buffer.byteLength(payload); } } + opts.body = payload; } // revert to user supplied Capitalisation if needed. if (opts.headers.hasOwnProperty('content-type') && (ctSet !== 'content-type')) { @@ -170,7 +176,6 @@ module.exports = function(RED) { opts.headers[clSet] = opts.headers['content-length']; delete opts.headers['content-length']; } - var urltotest = url; var noproxy; if (noprox) { for (var i in noprox) { @@ -180,22 +185,11 @@ module.exports = function(RED) { if (prox && !noproxy) { var match = prox.match(/^(http:\/\/)?(.+)?:([0-9]+)?/i); if (match) { - //opts.protocol = "http:"; - //opts.host = opts.hostname = match[2]; - //opts.port = (match[3] != null ? match[3] : 80); - opts.headers['Host'] = opts.host; - var heads = opts.headers; - var path = opts.pathname = opts.href; - opts = urllib.parse(prox); - opts.path = opts.pathname = path; - opts.headers = heads; - opts.method = method; - urltotest = match[0]; - if (opts.auth) { - opts.headers['Proxy-Authorization'] = "Basic "+new Buffer(opts.auth).toString('Base64') - } + opts.proxy = prox; + } else { + node.warn("Bad proxy url: "+ prox); + opts.proxy = null; } - else { node.warn("Bad proxy url: "+process.env.http_proxy); } } if (tlsNode) { tlsNode.addTLSOptions(opts); @@ -204,42 +198,37 @@ module.exports = function(RED) { opts.rejectUnauthorized = msg.rejectUnauthorized; } } - var req = ((/^https/.test(urltotest))?https:http).request(opts,function(res) { - // Force NodeJs to return a Buffer (instead of a string) - // See https://github.com/nodejs/node/issues/6038 - res.setEncoding(null); - delete res._readableState.decoder; - - msg.statusCode = res.statusCode; - msg.headers = res.headers; - msg.responseUrl = res.responseUrl; - msg.payload = []; - - if (msg.headers.hasOwnProperty('set-cookie')) { - msg.responseCookies = {}; - msg.headers['set-cookie'].forEach(function(c) { - var parsedCookie = cookie.parse(c); - var eq_idx = c.indexOf('='); - var key = c.substr(0, eq_idx).trim() - parsedCookie.value = parsedCookie[key]; - delete parsedCookie[key]; - msg.responseCookies[key] = parsedCookie; - - }) - - } - msg.headers['x-node-red-request-node'] = hashSum(msg.headers); - // msg.url = url; // revert when warning above finally removed - res.on('data',function(chunk) { - if (!Buffer.isBuffer(chunk)) { - // if the 'setEncoding(null)' fix above stops working in - // a new Node.js release, throw a noisy error so we know - // about it. - throw new Error("HTTP Request data chunk not a Buffer"); + request(opts, function(err, res, body) { + if(err){ + if(err.code === 'ETIMEDOUT' || err.code === 'ESOCKETTIMEDOUT') { + node.error(RED._("common.notification.errors.no-response"), msg); + node.status({fill:"red", shape:"ring", text:"common.notification.errors.no-response"}); + }else{ + node.error(err,msg); + node.status({fill:"red", shape:"ring", text:err.code}); } - msg.payload.push(chunk); - }); - res.on('end',function() { + msg.payload = err.toString() + " : " + url; + msg.statusCode = err.code; + node.send(msg); + }else{ + msg.statusCode = res.statusCode; + msg.headers = res.headers; + msg.responseUrl = res.request.uri.href; + msg.payload = body; + + if (msg.headers.hasOwnProperty('set-cookie')) { + msg.responseCookies = {}; + msg.headers['set-cookie'].forEach(function(c) { + var parsedCookie = cookie.parse(c); + var eq_idx = c.indexOf('='); + var key = c.substr(0, eq_idx).trim() + parsedCookie.value = parsedCookie[key]; + delete parsedCookie[key]; + msg.responseCookies[key] = parsedCookie; + }); + } + msg.headers['x-node-red-request-node'] = hashSum(msg.headers); + // msg.url = url; // revert when warning above finally removed if (node.metric()) { // Calculate request time var diff = process.hrtime(preRequestTimestamp); @@ -251,44 +240,19 @@ module.exports = function(RED) { } } - // Check that msg.payload is an array - if the req error - // handler has been called, it will have been set to a string - // and the error already handled - so no further action should - // be taken. #1344 - if (Array.isArray(msg.payload)) { - // Convert the payload to the required return type - msg.payload = Buffer.concat(msg.payload); // bin - if (node.ret !== "bin") { - msg.payload = msg.payload.toString('utf8'); // txt + // Convert the payload to the required return type + if (node.ret !== "bin") { + msg.payload = msg.payload.toString('utf8'); // txt - if (node.ret === "obj") { - try { msg.payload = JSON.parse(msg.payload); } // obj - catch(e) { node.warn(RED._("httpin.errors.json-error")); } - } + if (node.ret === "obj") { + try { msg.payload = JSON.parse(msg.payload); } // obj + catch(e) { node.warn(RED._("httpin.errors.json-error")); } } - node.status({}); - node.send(msg); } - }); + node.status({}); + node.send(msg); + } }); - req.setTimeout(node.reqTimeout, function() { - node.error(RED._("common.notification.errors.no-response"),msg); - setTimeout(function() { - node.status({fill:"red",shape:"ring",text:"common.notification.errors.no-response"}); - },10); - req.abort(); - }); - req.on('error',function(err) { - node.error(err,msg); - msg.payload = err.toString() + " : " + url; - msg.statusCode = err.code; - node.status({fill:"red",shape:"ring",text:err.code}); - node.send(msg); - }); - if (payload) { - req.write(payload); - } - req.end(); }); this.on("close",function() { diff --git a/package.json b/package.json index f90789e43..eb7f30214 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,6 @@ "cron": "1.3.0", "express": "4.16.3", "express-session": "1.15.6", - "follow-redirects": "1.4.1", "fs-extra": "5.0.0", "fs.notify": "0.0.4", "hash-sum": "1.0.2", @@ -69,6 +68,7 @@ "passport-http-bearer": "1.0.1", "passport-oauth2-client-password": "0.1.2", "raw-body": "2.3.3", + "request": "2.87.0", "semver": "5.5.0", "sentiment": "2.1.0", "uglify-js": "3.3.25", diff --git a/test/nodes/core/io/21-httprequest_spec.js b/test/nodes/core/io/21-httprequest_spec.js index 4a1b513f0..b35c55d66 100644 --- a/test/nodes/core/io/21-httprequest_spec.js +++ b/test/nodes/core/io/21-httprequest_spec.js @@ -825,7 +825,13 @@ describe('HTTP Request Node', function() { var n2 = helper.getNode("n2"); n2.on("input", function(msg) { try { - msg.should.have.property('statusCode','ECONNRESET'); + msg.should.have.property('statusCode','ESOCKETTIMEDOUT'); + var logEvents = helper.log().args.filter(function(evt) { + return evt[0].type == 'http request'; + }); + logEvents.should.have.length(1); + var tstmp = logEvents[0][0].timestamp; + logEvents[0][0].should.eql({level:helper.log().ERROR, id:'n1',type:'http request',msg:'common.notification.errors.no-response', timestamp:tstmp}); done(); } catch(err) { done(err); From fcbea2629c57250f8abfd31d5f693235b77611dd Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Wed, 23 May 2018 22:41:39 +0100 Subject: [PATCH 03/34] Support flow.disabled and .info in /flow API --- red/runtime/nodes/flows/index.js | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/red/runtime/nodes/flows/index.js b/red/runtime/nodes/flows/index.js index d1ba541f5..1b2a87ac0 100644 --- a/red/runtime/nodes/flows/index.js +++ b/red/runtime/nodes/flows/index.js @@ -477,11 +477,19 @@ function addFlow(flow) { } flow.id = redUtil.generateId(); - var nodes = [{ + var tabNode = { type:'tab', label:flow.label, id:flow.id - }]; + } + if (flow.hasOwnProperty('info')) { + tabNode.info = flow.info; + } + if (flow.hasOwnProperty('disabled')) { + tabNode.disabled = flow.disabled; + } + + var nodes = [tabNode]; for (i=0;i Date: Thu, 24 May 2018 12:06:39 +0900 Subject: [PATCH 04/34] fix test failure of icon scan on windows --- test/red/runtime/nodes/registry/registry_spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/red/runtime/nodes/registry/registry_spec.js b/test/red/runtime/nodes/registry/registry_spec.js index c5b9f6b5a..3a4a9fc21 100644 --- a/test/red/runtime/nodes/registry/registry_spec.js +++ b/test/red/runtime/nodes/registry/registry_spec.js @@ -563,7 +563,7 @@ describe("red/nodes/registry/registry",function() { } },icons: [{path:testIcon,icons:['test_icon.png']}]}); var iconPath = typeRegistry.getNodeIconPath('test-module','test_icon.png'); - iconPath.should.eql(testIcon+"/test_icon.png"); + iconPath.should.eql(path.resolve(testIcon+"/test_icon.png")); }); it('returns the debug icon when getting an unknown module', function() { From 10395ef254c37e3dd312b6e3ae8bfbad19334b33 Mon Sep 17 00:00:00 2001 From: Edward Vielmetti Date: Thu, 24 May 2018 04:48:05 -0400 Subject: [PATCH 05/34] typo fix *hierarchy (#1735) --- nodes/core/io/10-mqtt.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nodes/core/io/10-mqtt.html b/nodes/core/io/10-mqtt.html index 722a7a7ae..afe710472 100644 --- a/nodes/core/io/10-mqtt.html +++ b/nodes/core/io/10-mqtt.html @@ -41,7 +41,7 @@
payload string | buffer
a string unless detected as a binary buffer.
topic string
-
the MQTT topic, uses / as a heirarchy separator.
+
the MQTT topic, uses / as a hierarchy separator.
qos number
0, fire and forget - 1, at least once - 2, once and once only.
retain boolean
From 3df3d6f5162ea7598f2721354133a5d763ead1fb Mon Sep 17 00:00:00 2001 From: Dave Conway-Jones Date: Thu, 24 May 2018 10:02:51 +0100 Subject: [PATCH 06/34] add debug to trigger test to help work out fails --- test/nodes/core/core/89-trigger_spec.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/test/nodes/core/core/89-trigger_spec.js b/test/nodes/core/core/89-trigger_spec.js index fb1b1df9a..d07ab2a9b 100644 --- a/test/nodes/core/core/89-trigger_spec.js +++ b/test/nodes/core/core/89-trigger_spec.js @@ -428,13 +428,14 @@ describe('trigger node', function() { n2.on("input", function(msg) { try { if (c === 0) { + console.log(c,Date.now() - ss,msg); msg.should.have.a.property("payload", "Hello"); c += 1; } else { + console.log(c,Date.now() - ss,msg); msg.should.have.a.property("payload", "World"); - //console.log(Date.now() - ss); - (Date.now() - ss).should.be.greaterThan(140); + (Date.now() - ss).should.be.greaterThan(150); done(); } } @@ -444,7 +445,7 @@ describe('trigger node', function() { n1.emit("input", {payload:"Hello"}); setTimeout( function() { n1.emit("input", {payload:"Error"}); - },20); + },30); setTimeout( function() { n1.emit("input", {payload:"World"}); },150); From 0ef16989cddbe5858ebbf2e89a6a492fc714fbfb Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Thu, 24 May 2018 20:25:26 +0100 Subject: [PATCH 07/34] Do not trim wires if node declares outputs in defaults but misses value Fixes #1737 --- editor/js/nodes.js | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/editor/js/nodes.js b/editor/js/nodes.js index 0a2fe7268..433e400a2 100644 --- a/editor/js/nodes.js +++ b/editor/js/nodes.js @@ -1033,15 +1033,31 @@ RED.nodes = (function() { node.type = "unknown"; } if (node._def.category != "config") { - node.inputs = n.inputs||node._def.inputs; - node.outputs = n.outputs||node._def.outputs; - // If 'wires' is longer than outputs, clip wires + if (n.hasOwnProperty('inputs')) { + node.inputs = n.inputs; + node._config.inputs = JSON.stringify(n.inputs); + } else { + node.inputs = node._def.inputs; + } + if (n.hasOwnProperty('outputs')) { + node.outputs = n.outputs; + node._config.outputs = JSON.stringify(n.outputs); + } else { + node.outputs = node._def.outputs; + } if (node.hasOwnProperty('wires') && node.wires.length > node.outputs) { - console.log("Warning: node.wires longer than node.outputs - trimming wires:",node.id," wires:",node.wires.length," outputs:",node.outputs); - node.wires = node.wires.slice(0,node.outputs); + if (!node._def.defaults.hasOwnProperty("outputs") || !isNaN(parseInt(n.outputs))) { + // If 'wires' is longer than outputs, clip wires + console.log("Warning: node.wires longer than node.outputs - trimming wires:",node.id," wires:",node.wires.length," outputs:",node.outputs); + node.wires = node.wires.slice(0,node.outputs); + } else { + // The node declares outputs in its defaults, but has not got a valid value + // Defer to the length of the wires array + node.outputs = node.wires.length; + } } for (d in node._def.defaults) { - if (node._def.defaults.hasOwnProperty(d)) { + if (node._def.defaults.hasOwnProperty(d) && d !== 'inputs' && d !== 'outputs') { node[d] = n[d]; node._config[d] = JSON.stringify(n[d]); } From 40f41678944912145f5d32e0f214b8398ee9d48b Mon Sep 17 00:00:00 2001 From: Dave Conway-Jones Date: Thu, 24 May 2018 21:39:46 +0100 Subject: [PATCH 08/34] let TCP in node report remote ip and port when in single packet mode --- nodes/core/io/31-tcpin.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/nodes/core/io/31-tcpin.js b/nodes/core/io/31-tcpin.js index 5853d4f42..c3bc2ab8c 100644 --- a/nodes/core/io/31-tcpin.js +++ b/nodes/core/io/31-tcpin.js @@ -130,6 +130,8 @@ module.exports = function(RED) { socket.setKeepAlive(true,120000); if (socketTimeout !== null) { socket.setTimeout(socketTimeout); } var id = (1+Math.random()*4294967295).toString(16); + var fromi; + var fromp; connectionPool[id] = socket; count++; node.status({text:RED._("tcpin.status.connections",{count:count})}); @@ -155,18 +157,21 @@ module.exports = function(RED) { msg._session = {type:"tcp",id:id}; node.send(msg); } - } else { + } + else { if ((typeof data) === "string") { buffer = buffer+data; } else { buffer = Buffer.concat([buffer,data],buffer.length+data.length); } + fromi = socket.remoteAddress; + fromp = socket.remotePort; } }); socket.on('end', function() { if (!node.stream || (node.datatype === "utf8" && node.newline !== "")) { if (buffer.length > 0) { - var msg = {topic:node.topic, payload:buffer, ip:socket.remoteAddress, port:socket.remotePort}; + var msg = {topic:node.topic, payload:buffer, ip:fromi, port:fromp}; msg._session = {type:"tcp",id:id}; node.send(msg); } From 7f89a4a26f2079fe771ecc28587187f93c0f078d Mon Sep 17 00:00:00 2001 From: KatsuyaHoshii Date: Fri, 25 May 2018 11:48:33 +0900 Subject: [PATCH 09/34] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 328a85ef7..05edbdbb3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ matrix: include: - node_js: "10" script: - - istanbul cover ./node_modules/.bin/grunt --report lcovonly && istanbul report text && ( cat coverage/lcov.info | $(npm get prefix)/bin/coveralls || true ) && rm -rf coverage + - ./node_modules/.bin/grunt coverage && istanbul report text && ( cat coverage/lcov.info | $(npm get prefix)/bin/coveralls || true ) && rm -rf coverage before_script: - npm install -g istanbul coveralls - node_js: "8" From 252df81f5963a76ea11619496a9aa38a1ebb0978 Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Fri, 25 May 2018 10:50:58 +0100 Subject: [PATCH 10/34] Pass Date into the Function node sandbox to fix instanceof tests --- nodes/core/core/80-function.js | 1 + test/nodes/core/core/80-function_spec.js | 16 ++++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/nodes/core/core/80-function.js b/nodes/core/core/80-function.js index 8aa95e4fc..0a7448ccd 100644 --- a/nodes/core/core/80-function.js +++ b/nodes/core/core/80-function.js @@ -80,6 +80,7 @@ module.exports = function(RED) { console:console, util:util, Buffer:Buffer, + Date: Date, RED: { util: RED.util }, diff --git a/test/nodes/core/core/80-function_spec.js b/test/nodes/core/core/80-function_spec.js index b96588b5b..f19e933dc 100644 --- a/test/nodes/core/core/80-function_spec.js +++ b/test/nodes/core/core/80-function_spec.js @@ -508,6 +508,22 @@ describe('function node', function() { }); }); + + it('should use the same Date object from outside the sandbox', function(done) { + var flow = [{id:"n1",type:"function",wires:[["n2"]],func:"msg.payload=global.get('typeTest')(new Date());return msg;"}, + {id:"n2", type:"helper"}]; + helper.load(functionNode, flow, function() { + var n1 = helper.getNode("n1"); + var n2 = helper.getNode("n2"); + n1.context().global.set("typeTest",function(d) { return d instanceof Date }); + n2.on("input", function(msg) { + msg.should.have.property('payload', true); + done(); + }); + n1.receive({payload:"foo",topic: "bar"}); + }); + }); + describe('Logger', function () { it('should log an Info Message', function (done) { var flow = [{id: "n1", type: "function", wires: [["n2"]], func: "node.log('test');"}]; From 5069f2844c86ff5061f6fde20b82455801cdeaee Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Fri, 25 May 2018 10:51:29 +0100 Subject: [PATCH 11/34] Bump jsonata version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f90789e43..0f8b7fbd3 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,7 @@ "is-utf8": "0.2.1", "js-yaml": "3.11.0", "json-stringify-safe": "5.0.1", - "jsonata": "1.5.3", + "jsonata": "1.5.4", "media-typer": "0.3.0", "memorystore": "1.6.0", "mqtt": "2.18.0", From bca020bc4dbf357614c2f59e1c6752b1cd435982 Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Fri, 25 May 2018 11:36:17 +0100 Subject: [PATCH 12/34] Tidy up default grunt task and fixup test break due to reorder Fixes #1738 --- .travis.yml | 2 +- Gruntfile.js | 4 ++-- red/api/auth/users.js | 4 ++++ test/red/api/auth/users_spec.js | 8 +++++--- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 05edbdbb3..054edefba 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ matrix: include: - node_js: "10" script: - - ./node_modules/.bin/grunt coverage && istanbul report text && ( cat coverage/lcov.info | $(npm get prefix)/bin/coveralls || true ) && rm -rf coverage + - ./node_modules/.bin/grunt && istanbul report text && ( cat coverage/lcov.info | $(npm get prefix)/bin/coveralls || true ) && rm -rf coverage before_script: - npm install -g istanbul coveralls - node_js: "8" diff --git a/Gruntfile.js b/Gruntfile.js index 2be2d23c0..3738e60b4 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -55,7 +55,7 @@ module.exports = function(grunt) { reportFormats: ['lcov','html'], print: 'both' }, - all: { src: ['test/**/*_spec.js'] }, + all: { src: ["test/_spec.js","test/red/**/*_spec.js","test/nodes/**/*_spec.js"] }, core: { src: ["test/_spec.js","test/red/**/*_spec.js"]}, nodes: { src: ["test/nodes/**/*_spec.js"]} }, @@ -474,7 +474,7 @@ module.exports = function(grunt) { grunt.registerTask('default', 'Builds editor content then runs code style checks and unit tests on all components', - ['build','test-core','test-editor','test-nodes']); + ['build','jshint:editor','mocha_istanbul:all']); grunt.registerTask('test-core', 'Runs code style check and unit tests on core runtime code', diff --git a/red/api/auth/users.js b/red/api/auth/users.js index 92c4c9ce9..24a762958 100644 --- a/red/api/auth/users.js +++ b/red/api/auth/users.js @@ -86,6 +86,10 @@ function init(config) { } else { api.authenticate = authenticate; } + } else { + api.get = get; + api.authenticate = authenticate; + api.default = api.default; } if (config.default) { if (typeof config.default === "function") { diff --git a/test/red/api/auth/users_spec.js b/test/red/api/auth/users_spec.js index 23c34001d..e7b70f7b1 100644 --- a/test/red/api/auth/users_spec.js +++ b/test/red/api/auth/users_spec.js @@ -194,8 +194,7 @@ describe("api/auth/users", function() { it('should fail to return user fred',function(done) { Users.get("fred").then(function(userf) { try { - userf.should.not.have.a.property("username","fred"); - userf.should.not.have.a.property("permissions","*"); + should.not.exist(userf); done(); } catch(err) { done(err); @@ -212,9 +211,12 @@ describe("api/auth/users", function() { default: function() { return("Done"); } }); }); + after(function() { + Users.init({}); + }); describe('#default',function() { it('handles api.default being a function',function(done) { - Users.should.have.property('default').which.is.a.Function; + Users.should.have.property('default').which.is.a.Function(); (Users.default()).should.equal("Done"); done(); }); From 8cb2e5140762c1a53abc946f326670867c7a24ca Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Fri, 25 May 2018 11:40:14 +0100 Subject: [PATCH 13/34] Relax twitter node version ready for major version bump --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0f8b7fbd3..820f6e426 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "node-red-node-email": "0.1.*", "node-red-node-feedparser": "0.1.*", "node-red-node-rbe": "0.2.*", - "node-red-node-twitter": "0.1.*", + "node-red-node-twitter": "*", "nopt": "4.0.1", "oauth2orize": "1.11.0", "on-headers": "1.0.1", From 787709371361f3055aac1a7d3b11ca9aad58dcc2 Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Fri, 25 May 2018 13:23:18 +0100 Subject: [PATCH 14/34] Bump 0.18.7 --- CHANGELOG.md | 18 ++++++++++++++++++ package.json | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1d6cccb65..749226d20 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,21 @@ +#### 0.18.7: Maintenance Release + + +Editor Fixes + + - - Do not trim wires if node declares outputs in defaults but misses value Fixes #1737 + +Node Fixes + + - Relax twitter node version ready for major version bump + - Pass Date into the Function node sandbox to fix instanceof tests + - let TCP in node report remote ip and port when in single packet mode + - typo fix in node help (#1735) + +Other Fixes + - Tidy up default grunt task and fixup test break due to reorder Fixes #1738 + - Bump jsonata version + #### 0.18.6: Maintenance Release Editor Fixes diff --git a/package.json b/package.json index 820f6e426..ec0f63a34 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "node-red", - "version": "0.18.6", + "version": "0.18.7", "description": "A visual tool for wiring the Internet of Things", "homepage": "http://nodered.org", "license": "Apache-2.0", From 472bbdb59f59108b7fa8624f1a8a2110d213530c Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Fri, 25 May 2018 13:27:58 +0100 Subject: [PATCH 15/34] Fix typo in CHANGELOG --- CHANGELOG.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 749226d20..2a73106c4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,8 @@ #### 0.18.7: Maintenance Release - Editor Fixes - - - Do not trim wires if node declares outputs in defaults but misses value Fixes #1737 + - Do not trim wires if node declares outputs in defaults but misses value Fixes #1737 Node Fixes From a5c00b5c81fd5c3c7f8877c602d4b2dd49458aeb Mon Sep 17 00:00:00 2001 From: YumaMatsuura <38545050+YumaMatsuura@users.noreply.github.com> Date: Fri, 25 May 2018 21:55:03 +0900 Subject: [PATCH 16/34] add translate-user-settings (#1740) --- editor/js/ui/projects/projectUserSettings.js | 44 ++++++++++---------- red/api/editor/locales/en-US/editor.json | 25 ++++++++++- red/api/editor/locales/ja/editor.json | 25 ++++++++++- 3 files changed, 70 insertions(+), 24 deletions(-) diff --git a/editor/js/ui/projects/projectUserSettings.js b/editor/js/ui/projects/projectUserSettings.js index 4c3840461..a343a07cc 100644 --- a/editor/js/ui/projects/projectUserSettings.js +++ b/editor/js/ui/projects/projectUserSettings.js @@ -24,18 +24,18 @@ RED.projects.userSettings = (function() { var currentGitSettings = RED.settings.get('git') || {}; currentGitSettings.user = currentGitSettings.user || {}; - var title = $('

').text("Committer Details").appendTo(pane); + var title = $('

').text(RED._("editor:sidebar.project.userSettings.committerDetail")).appendTo(pane); var gitconfigContainer = $('').appendTo(pane); - $('
').appendTo(gitconfigContainer).text("Leave blank to use system default"); + $('
').appendTo(gitconfigContainer).text(RED._("editor:sidebar.project.userSettings.committer-tip")); var row = $('').appendTo(gitconfigContainer); - $('').text('Username').appendTo(row); + $('').text(RED._("editor:sidebar.project.userSettings.userName")).appendTo(row); gitUsernameInput = $('').appendTo(row); gitUsernameInput.val(currentGitSettings.user.name||""); row = $('').appendTo(gitconfigContainer); - $('').text('Email').appendTo(row); + $('').text(RED._("editor:sidebar.project.userSettings.email")).appendTo(row); gitEmailInput = $('').appendTo(row); gitEmailInput.val(currentGitSettings.user.email||""); } @@ -44,10 +44,10 @@ RED.projects.userSettings = (function() { function createSSHKeySection(pane) { var container = $('').appendTo(pane); var popover; - var title = $('

').text("SSH Keys").appendTo(container); - var subtitle = $('
').appendTo(container).text("Allows you to create secure connections to remote git repositories."); + var title = $('

').text(RED._("editor:sidebar.project.userSettings.sshKeys")).appendTo(container); + var subtitle = $('
').appendTo(container).text(RED._("editor:sidebar.project.userSettings.sshKeys-tip")); - var addKeyButton = $('') + var addKeyButton = $('') .appendTo(subtitle) .click(function(evt) { addKeyButton.attr('disabled',true); @@ -72,9 +72,9 @@ RED.projects.userSettings = (function() { var validPassphrase = passphrase.length === 0 || passphrase.length >= 8; passphraseInput.toggleClass('input-error',!validPassphrase); if (!validPassphrase) { - passphraseInputSubLabel.text("Passphrase too short"); + passphraseInputSubLabel.text(RED._("editor:sidebar.project.userSettings.passphrase-short")); } else if (passphrase.length === 0) { - passphraseInputSubLabel.text("Optional"); + passphraseInputSubLabel.text(RED._("editor:sidebar.project.userSettings.optional")); } else { passphraseInputSubLabel.text(""); } @@ -91,11 +91,11 @@ RED.projects.userSettings = (function() { var row = $('').appendTo(container); var addKeyDialog = $('
').hide().appendTo(row); - $('
').text('Add SSH Key').appendTo(addKeyDialog); + $('
').text(RED._("editor:sidebar.project.userSettings.add-sshKey")).appendTo(addKeyDialog); var addKeyDialogBody = $('
').appendTo(addKeyDialog); row = $('').appendTo(addKeyDialogBody); - $('
').appendTo(row).text("Generate a new public/private key pair"); + $('
').appendTo(row).text(RED._("editor:sidebar.project.userSettings.add-sshKey-tip")); // var bg = $('
',{class:"button-group", style:"text-align: center"}).appendTo(row); // var addLocalButton = $('').appendTo(bg); // var uploadButton = $('').appendTo(bg); @@ -125,19 +125,19 @@ RED.projects.userSettings = (function() { row = $('').appendTo(addKeyDialogBody); - $('').text('Name').appendTo(row); + $('').text(RED._("editor:sidebar.project.userSettings.name")).appendTo(row); var keyNameInputChanged = false; var keyNameInput = $('').appendTo(row).on("change keyup paste",function() { keyNameInputChanged = true; validateForm(); }); - $('').appendTo(row).find("small"); + $('').appendTo(row).find("small"); var generateKeyPane = $('
').appendTo(addKeyDialogBody); row = $('').appendTo(generateKeyPane); - $('').text('Passphrase').appendTo(row); + $('').text(RED._("editor:sidebar.project.userSettings.passphrase")).appendTo(row); var passphraseInput = $('').appendTo(row).on("change keyup paste",validateForm); - var passphraseInputSubLabel = $('').appendTo(row).find("small"); + var passphraseInputSubLabel = $('').appendTo(row).find("small"); // var addLocalKeyPane = $('
').hide().appendTo(addKeyDialogBody); // row = $('').appendTo(addLocalKeyPane); @@ -179,13 +179,13 @@ RED.projects.userSettings = (function() { } } var formButtons = $('').appendTo(addKeyDialog); - $('') + $('') .appendTo(formButtons) .click(function(evt) { evt.preventDefault(); hideEditForm(); }); - var saveButton = $('') + var saveButton = $('') .appendTo(formButtons) .click(function(evt) { evt.preventDefault(); @@ -264,7 +264,7 @@ RED.projects.userSettings = (function() { utils.sendRequest(options); var formButtons = $('').appendTo(row); - $('') + $('') .appendTo(formButtons) .click(function(evt) { try { @@ -289,7 +289,7 @@ RED.projects.userSettings = (function() { var container = $('
').appendTo(row); if (entry.empty) { container.addClass('red-ui-search-empty'); - container.text("No SSH keys"); + container.text(RED._("editor:sidebar.project.userSettings.no-sshKeys")); return; } var topRow = $('
').appendTo(container); @@ -313,7 +313,7 @@ RED.projects.userSettings = (function() { .click(function(e) { e.stopPropagation(); var spinner = utils.addSpinnerOverlay(row).addClass('projects-dialog-spinner-contain'); - var notification = RED.notify("Are you sure you want to delete the SSH key '"+entry.name+"'? This cannot be undone.", { + var notification = RED.notify(RED._("editor:sidebar.project.userSettings.deleteConfirm", {name:entry.name}), { type: 'warning', modal: true, fixed: true, @@ -326,7 +326,7 @@ RED.projects.userSettings = (function() { } }, { - text: "Delete key", + text: RED._("editor:sidebar.project.userSettings.delete"), click: function() { notification.close(); var url = "settings/user/keys/"+entry.name; @@ -400,7 +400,7 @@ RED.projects.userSettings = (function() { utils = _utils; RED.userSettings.add({ id:'gitconfig', - title: "Git config", // TODO: nls + title: RED._("editor:sidebar.project.userSettings.git-config"), // TODO: nls get: createSettingsPane, close: function() { var currentGitSettings = RED.settings.get('git') || {}; diff --git a/red/api/editor/locales/en-US/editor.json b/red/api/editor/locales/en-US/editor.json index d827ba092..dfcef21a6 100644 --- a/red/api/editor/locales/en-US/editor.json +++ b/red/api/editor/locales/en-US/editor.json @@ -434,7 +434,30 @@ "dependencies": "Dependencies", "settings": "Settings", "editDescription": "Edit project description", - "editDependencies": "Edit project dependencies" + "editDependencies": "Edit project dependencies", + "userSettings": { + "committerDetail": "Committer Details", + "committer-tip": "Leave blank to use system default", + "userName": "Username", + "email": "Email", + "sshKeys": "SSH Keys", + "sshKeys-tip": "Allows you to create secure connections to remote git repositories.", + "add": "add key", + "add-sshKey": "Add SSH Key", + "add-sshKey-tip": "Generate a new public/private key pair", + "name": "Name", + "nameRule": "Must contain only A-Z 0-9 _ -", + "passphrase": "Passphrase", + "passphrase-short": "Passphrase too short", + "optional": "Optional", + "cancel": "Cancel", + "generate": "Generate key", + "no-sshKeys": "No SSH keys", + "copy-publicKey": "Copy public key to clipboard", + "delete": "Delete key", + "git-config": "Git config", + "deleteConfirm": "Are you sure you want to delete the SSH key __name__? This cannot be undone." + } } }, "typedInput": { diff --git a/red/api/editor/locales/ja/editor.json b/red/api/editor/locales/ja/editor.json index 68e4fc517..999dc3422 100644 --- a/red/api/editor/locales/ja/editor.json +++ b/red/api/editor/locales/ja/editor.json @@ -424,7 +424,30 @@ "dependencies": "依存関係", "settings": "設定", "editDescription": "プロジェクトの詳細を編集", - "editDependencies": "プロジェクトの依存関係を編集" + "editDependencies": "プロジェクトの依存関係を編集", + "userSettings": { + "committerDetail": "コミッター詳細", + "committer-tip": "システムのデフォルトを使用する場合、空白のままにしてください", + "userName": "ユーザ名", + "email": "メールアドレス", + "sshKeys": "SSH キー", + "sshKeys-tip": "gitリポジトリへのセキュアな接続を作成できます。", + "add": "キーを追加", + "add-sshKey": "SSHキーを追加", + "add-sshKey-tip": "新しい公開鍵/秘密鍵ペアを生成します", + "name": "名前", + "nameRule": "A-Z 0-9 _ - のみを含む", + "passphrase": "パスフレーズ", + "passphrase-short": "パスフレーズが短すぎます", + "optional": "任意", + "cancel": "中止", + "generate": "キーを生成", + "no-sshKeys": "SSHキーがありません", + "copy-publicKey": "公開鍵をクリップボードにコピー", + "delete": "キーを削除", + "git-config": "Git設定", + "deleteConfirm": "SSHキー __name__ を削除してもよいですか？ 削除したSSHキーを元に戻すことはできません。" + } } }, "typedInput": { From c157960846578a50998b2e18bad8da023b5cf471 Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Thu, 24 May 2018 16:47:51 +0100 Subject: [PATCH 17/34] Change debug sidebar icon --- nodes/core/core/58-debug.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nodes/core/core/58-debug.html b/nodes/core/core/58-debug.html index 95b55d7f5..dc011ebda 100644 --- a/nodes/core/core/58-debug.html +++ b/nodes/core/core/58-debug.html @@ -156,7 +156,7 @@ toolbar: uiComponents.footer, enableOnEdit: true, pinned: true, - iconClass: "fa fa-wrench" + iconClass: "fa fa-list-alt" }); RED.actions.add("core:show-debug-tab",function() { RED.sidebar.show('debug'); }); From 392ed706fdd4a33333ec35a5a7b7ae49b0130c98 Mon Sep 17 00:00:00 2001 From: Hiroyasu Nishiyama Date: Sat, 26 May 2018 14:21:30 +0900 Subject: [PATCH 18/34] add i18n support for projects interface and Japanese message catalogue --- editor/js/ui/projects/projects.js | 319 +++++++++++------------ red/api/editor/locales/en-US/editor.json | 168 +++++++++++- red/api/editor/locales/ja/editor.json | 168 +++++++++++- 3 files changed, 492 insertions(+), 163 deletions(-) diff --git a/editor/js/ui/projects/projects.js b/editor/js/ui/projects/projects.js index d7c2787d8..71a19d661 100644 --- a/editor/js/ui/projects/projects.js +++ b/editor/js/ui/projects/projects.js @@ -22,18 +22,18 @@ RED.projects = (function() { function reportUnexpectedError(error) { var notification; if (error.error === 'git_missing_user') { - notification = RED.notify("

You Git client is not configured with a username/email.

",{ + notification = RED.notify("

"+RED._("projects.errors.no-username-email")+"

",{ fixed: true, type:'error', buttons: [ { - text: "Cancel", + text: RED._("common.label.cancel"), click: function() { notification.close(); } }, { - text: "Configure Git client", + text: RED._("projects.config-git"), click: function() { RED.userSettings.show('gitconfig'); notification.close(); @@ -43,13 +43,13 @@ RED.projects = (function() { }) } else { console.log(error); - notification = RED.notify("

An unexpected error occurred:

"+error.message+"

code: "+error.error+"",{ + notification = RED.notify("

"+RED._("projects.errors.unexpected")+":

"+error.message+"

"+RED._("projects.errors.code")+": "+error.error+"",{ fixed: true, modal: true, type: 'error', buttons: [ { - text: "Close", + text: RED._("common.label.close"), click: function() { notification.close(); } @@ -75,14 +75,14 @@ RED.projects = (function() { migrateProjectHeader.appendTo(container); var body = $('
').appendTo(container); - $('

').text("Hello! We have introduced 'projects' to Node-RED.").appendTo(body); - $('

').text("This is a new way for you to manage your flow files and includes version control of your flows.").appendTo(body); - $('

').text("To get started you can create your first project or clone an existing project from a git repository.").appendTo(body); - $('

').text("If you are not sure, you can skip this for now. You will still be able to create your first project from the 'Projects' menu at any time.").appendTo(body); + $('

').text(RED._("projects.welcome.hello")).appendTo(body); + $('

').text(RED._("projects.welcome.desc0")).appendTo(body); + $('

').text(RED._("projects.welcome.desc1")).appendTo(body); + $('

').text(RED._("projects.welcome.desc2")).appendTo(body); var row = $('

').appendTo(body); - var createAsEmpty = $('').appendTo(row); - var createAsClone = $('').appendTo(row); + var createAsEmpty = $('').appendTo(row); + var createAsClone = $('').appendTo(row); createAsEmpty.click(function(e) { e.preventDefault(); @@ -105,7 +105,7 @@ RED.projects = (function() { buttons: [ { // id: "clipboard-dialog-cancel", - text: "Not right now", + text: RED._("projects.welcome.not-right-now"), click: function() { createProjectOptions = {}; $( this ).dialog( "close" ); @@ -139,23 +139,23 @@ RED.projects = (function() { migrateProjectHeader.appendTo(container); var body = $('
').appendTo(container); - $('

').text("Setup your version control client").appendTo(body); - $('

').text("Node-RED uses the open source tool Git for version control. It tracks changes to your project files and lets you push them to remote repositories.").appendTo(body); - $('

').text("When you commit a set of changes, Git records who made the changes with a username and email address. The Username can be anything you want - it does not need to be your real name.").appendTo(body); + $('

').text(RED._("projects.git-config.setup")).appendTo(body); + $('

').text(RED._("projects.git-config.desc0")).appendTo(body); + $('

').text(RED._("projects.git-config.desc1")).appendTo(body); if (isGlobalConfig) { - $('

').text("Your Git client is already configured with the details below.").appendTo(body); + $('

').text(RED._("projects.git-config.desc2")).appendTo(body); } - $('

').text("You can change these settings later under the 'Git config' tab of the settings dialog.").appendTo(body); + $('

').text(RED._("projects.git-config.desc3")).appendTo(body); var row = $('

').appendTo(body); - $('').appendTo(row); + $('').appendTo(row); gitUsernameInput = $('').val((existingGitSettings&&existingGitSettings.name)||"").appendTo(row); // $('
').text("This does not need to be your real name").appendTo(row); gitUsernameInput.on("change keyup paste",validateForm); row = $('
').appendTo(body); - $('').appendTo(row); + $('').appendTo(row); gitEmailInput = $('').val((existingGitSettings&&existingGitSettings.email)||"").appendTo(row); gitEmailInput.on("change keyup paste",validateForm); // $('
').text("Something something email").appendTo(row); @@ -168,14 +168,14 @@ RED.projects = (function() { buttons: [ { // id: "clipboard-dialog-cancel", - text: "Back", + text: RED._("common.label.back"), click: function() { show('welcome'); } }, { id: "projects-dialog-git-config", - text: "Next", // TODO: nls + text: RED._("common.label.next"), class: "primary", click: function() { var currentGitSettings = RED.settings.get('git') || {}; @@ -216,10 +216,10 @@ RED.projects = (function() { migrateProjectHeader.appendTo(container); var body = $('
').appendTo(container); - $('

').text("Create your project").appendTo(body); - $('

').text("A project is maintained as a Git repository. It makes it much easier to share your flows with others and to collaborate on them.").appendTo(body); - $('

').text("You can create multiple projects and quickly switch between them from the editor.").appendTo(body); - $('

').text("To begin, your project needs a name and an optional description.").appendTo(body); + $('

').text(RED._("projects.project-details.create")).appendTo(body); + $('

').text(RED._("projects.project-details.desc0")).appendTo(body); + $('

').text(RED._("projects.project-details.desc1")).appendTo(body); + $('

').text(RED._("projects.project-details.desc2")).appendTo(body); var validateForm = function() { var projectName = projectNameInput.val(); @@ -236,14 +236,14 @@ RED.projects = (function() { projectNameValid = false; valid = false; if (projectList[projectName]) { - projectNameSublabel.text("Project already exists"); + projectNameSublabel.text(RED._("projects.project-details.already-exists")); } else { - projectNameSublabel.text("Must contain only A-Z 0-9 _ -"); + projectNameSublabel.text(RED._("projects.project-details.must-contain")); } } else { projectNameInput.removeClass("input-error"); $('').appendTo(projectNameStatus); - projectNameSublabel.text("Must contain only A-Z 0-9 _ -"); + projectNameSublabel.text(RED._("projects.project-details.must-contain")); projectNameValid = true; } projectNameLastChecked = projectName; @@ -253,7 +253,7 @@ RED.projects = (function() { } var row = $('

').appendTo(body); - $('').appendTo(row); + $('').appendTo(row); var subrow = $('
').appendTo(row); projectNameInput = $('').val(createProjectOptions.name||"").appendTo(subrow); @@ -283,13 +283,13 @@ RED.projects = (function() { checkProjectName = null; },300) }); - projectNameSublabel = $('').appendTo(row).find("small"); + projectNameSublabel = $('').appendTo(row).find("small"); // Empty Project row = $('
').appendTo(body); - $('').appendTo(row); + $('').appendTo(row); projectSummaryInput = $('').val(createProjectOptions.summary||"").appendTo(row); - $('').appendTo(row); + $('').appendTo(row); setTimeout(function() { projectNameInput.focus(); @@ -300,7 +300,7 @@ RED.projects = (function() { buttons: function(options) { return [ { - text: "Back", + text: RED._("common.label.back"), click: function() { show('git-config'); } @@ -308,7 +308,7 @@ RED.projects = (function() { { id: "projects-dialog-create-name", disabled: true, - text: "Next", // TODO: nls + text: RED._("common.label.next"), class: "primary disabled", click: function() { createProjectOptions.name = projectNameInput.val(); @@ -344,8 +344,8 @@ RED.projects = (function() { var container = $('
'); migrateProjectHeader.appendTo(container); var body = $('
').appendTo(container); - $('

').text("Clone a project").appendTo(body); - $('

').text("If you already have a git repository containing a project, you can clone it to get started.").appendTo(body); + $('

').text(RED._("projects.clone-project.clone")).appendTo(body); + $('

').text(RED._("projects.clone-project.desc0")).appendTo(body); var projectList = null; var pendingFormValidation = false; @@ -376,14 +376,14 @@ RED.projects = (function() { projectNameValid = false; valid = false; if (projectList[projectName]) { - projectNameSublabel.text("Project already exists"); + projectNameSublabel.text(RED._("projects.clone-project.already-exists")); } else { - projectNameSublabel.text("Must contain only A-Z 0-9 _ -"); + projectNameSublabel.text(RED._("projects.clone-project.must-contain")); } } else { projectNameInput.removeClass("input-error"); $('').appendTo(projectNameStatus); - projectNameSublabel.text("Must contain only A-Z 0-9 _ -"); + projectNameSublabel.text(RED._("projects.clone-project.must-contain")); projectNameValid = true; } projectNameLastChecked = projectName; @@ -395,7 +395,7 @@ RED.projects = (function() { // var validRepo = /^(?:file|git|ssh|https?|[\d\w\.\-_]+@[\w\.]+):(?:\/\/)?[\w\.@:\/~_-]+(?:\/?|\#[\d\w\.\-_]+?)$/.test(repo); var validRepo = repo.length > 0 && !/\s/.test(repo); if (/^https?:\/\/[^/]+@/i.test(repo)) { - $("#projects-dialog-screen-create-project-repo-label small").text("Do not include the username/password in the url"); + $("#projects-dialog-screen-create-project-repo-label small").text(RED._("projects.clone-project.no-info-in-url")); validRepo = false; } if (!validRepo) { @@ -426,7 +426,7 @@ RED.projects = (function() { var row; row = $('

').appendTo(body); - $('').appendTo(row); + $('').appendTo(row); var subrow = $('
').appendTo(row); projectNameInput = $('').appendTo(subrow); @@ -456,19 +456,19 @@ RED.projects = (function() { checkProjectName = null; },300) }); - projectNameSublabel = $('').appendTo(row).find("small"); + projectNameSublabel = $('').appendTo(row).find("small"); row = $('
').appendTo(body); - $('').appendTo(row); + $('').appendTo(row); projectRepoInput = $('').appendTo(row); - $('').appendTo(row); + $('').appendTo(row); var projectRepoChanged = false; var lastProjectRepo = ""; projectRepoInput.on("change keyup paste",function() { projectRepoChanged = true; var repo = $(this).val(); if (lastProjectRepo !== repo) { - $("#projects-dialog-screen-create-project-repo-label small").text("https://, ssh:// or file://"); + $("#projects-dialog-screen-create-project-repo-label small").text(RED._("projects.clone-project.protocols")); } lastProjectRepo = repo; @@ -486,24 +486,24 @@ RED.projects = (function() { var cloneAuthRows = $('
').appendTo(body); row = $('
').hide().appendTo(cloneAuthRows); - $('
Authentication failed
').appendTo(row); + $('
'+RED._("projects.clone-project.auth-failed")+'
').appendTo(row); // Repo credentials - username/password ---------------- row = $('
').hide().appendTo(cloneAuthRows); var subrow = $('
').appendTo(row); - $('').appendTo(subrow); + $('').appendTo(subrow); projectRepoUserInput = $('').appendTo(subrow); subrow = $('
').appendTo(row); - $('').appendTo(subrow); + $('').appendTo(subrow); projectRepoPasswordInput = $('').appendTo(subrow); // ----------------------------------------------------- // Repo credentials - key/passphrase ------------------- row = $('
').hide().appendTo(cloneAuthRows); subrow = $('
').appendTo(row); - $('').appendTo(subrow); + $('').appendTo(subrow); projectRepoSSHKeySelect = $("').appendTo(subrow); subrow = $('
').appendTo(cloneAuthRows); var sshwarningRow = $('
').hide().appendTo(subrow); - $('
Before you can clone a repository over ssh you must add an SSH key to access it.
').appendTo(sshwarningRow); + $('
'+RED._("projects.clone-project.ssh-key-desc")+'
').appendTo(sshwarningRow); subrow = $('
').appendTo(sshwarningRow); - $('').appendTo(subrow).click(function(e) { + $('').appendTo(subrow).click(function(e) { e.preventDefault(); $('#projects-dialog-cancel').click(); RED.userSettings.show('gitconfig'); @@ -543,7 +543,7 @@ RED.projects = (function() { // Secret - clone row = $('
').appendTo(body); - $('').appendTo(row); + $('').appendTo(row); projectSecretInput = $('').appendTo(row); @@ -553,7 +553,7 @@ RED.projects = (function() { buttons: function(options) { return [ { - text: "Back", + text: RED._("common.label.back"), click: function() { show('git-config'); } @@ -561,7 +561,7 @@ RED.projects = (function() { { id: "projects-dialog-clone-project", disabled: true, - text: "Clone project", // TODO: nls + text: RED._("common.label.clone"), class: "primary disabled", click: function() { var projectType = $(".projects-dialog-screen-create-type.selected").data('type'); @@ -585,7 +585,7 @@ RED.projects = (function() { }; } else { - console.log("Error! Can't get selected SSH key path."); + console.log(RED._("projects.clone-project.cant-get-ssh-key")); return; } } @@ -602,7 +602,7 @@ RED.projects = (function() { } $(".projects-dialog-screen-create-row-auth-error").hide(); - $("#projects-dialog-screen-create-project-repo-label small").text("https://, ssh:// or file://"); + $("#projects-dialog-screen-create-project-repo-label small").text(RED._("projects.clone-project.protocols")); projectRepoUserInput.removeClass("input-error"); projectRepoPasswordInput.removeClass("input-error"); @@ -622,22 +622,22 @@ RED.projects = (function() { }, 400: { 'project_exists': function(error) { - console.log("already exists"); + console.log(RED._("projects.clone-project.already-exists")); }, 'git_error': function(error) { - console.log("git error",error); + console.log(RED._("projects.clone-project.git-error"),error); }, 'git_connection_failed': function(error) { projectRepoInput.addClass("input-error"); - $("#projects-dialog-screen-create-project-repo-label small").text("Connection failed"); + $("#projects-dialog-screen-create-project-repo-label small").text(RED._("projects.clone-project.connection-failed")); }, 'git_not_a_repository': function(error) { projectRepoInput.addClass("input-error"); - $("#projects-dialog-screen-create-project-repo-label small").text("Not a git repository"); + $("#projects-dialog-screen-create-project-repo-label small").text(RED._("projects.clone-project.not-git-repo")); }, 'git_repository_not_found': function(error) { projectRepoInput.addClass("input-error"); - $("#projects-dialog-screen-create-project-repo-label small").text("Repository not found"); + $("#projects-dialog-screen-create-project-repo-label small").text(RED._("projects.clone-project.repo-not-found")); }, 'git_auth_failed': function(error) { $(".projects-dialog-screen-create-row-auth-error").show(); @@ -689,11 +689,11 @@ RED.projects = (function() { migrateProjectHeader.appendTo(container); var body = $('
').appendTo(container); - $('

').text("Create your project files").appendTo(body); - $('

').text("A project contains your flow files, a README file and a package.json file.").appendTo(body); - $('

').text("It can contain any other files you want to maintain in the Git repository.").appendTo(body); + $('

').text(RED._("projects.default-files.create")).appendTo(body); + $('

').text(RED._("projects.default-files.desc0")).appendTo(body); + $('

').text(RED._("projects.default-files.desc1")).appendTo(body); if (!options.existingProject && RED.settings.files) { - $('

').text("Your existing flow and credential files will be copied into the project.").appendTo(body); + $('

').text(RED._("projects.default-files.desc2")).appendTo(body); } var validateForm = function() { @@ -724,7 +724,7 @@ RED.projects = (function() { $("#projects-dialog-create-default-files").prop('disabled',!valid).toggleClass('disabled ui-button-disabled ui-state-disabled',!valid); } var row = $('

').appendTo(body); - $('').appendTo(row); + $('').appendTo(row); var subrow = $('
').appendTo(row); var defaultFlowFile = (createProjectOptions.files &&createProjectOptions.files.flow) || (RED.settings.files && RED.settings.files.flow)||"flow.json"; projectFlowFileInput = $('').val(defaultFlowFile) @@ -735,7 +735,7 @@ RED.projects = (function() { var defaultCredentialsFile = (createProjectOptions.files &&createProjectOptions.files.credentials) || (RED.settings.files && RED.settings.files.credentials)||"flow_cred.json"; row = $('
').appendTo(body); - $('').appendTo(row); + $('').appendTo(row); subrow = $('
').appendTo(row); projectCredentialFileInput = $('
').text(defaultCredentialsFile) .appendTo(subrow); @@ -752,7 +752,7 @@ RED.projects = (function() { return [ { // id: "clipboard-dialog-cancel", - text: options.existingProject?"Cancel":"Back", + text: RED._(options.existingProject ? "common.label.cancel": "common.label.back"), click: function() { if (options.existingProject) { $(this).dialog('close'); @@ -763,7 +763,7 @@ RED.projects = (function() { }, { id: "projects-dialog-create-default-files", - text: "Next", // TODO: nls + text: RED._("common.label.next"), class: "primary", click: function() { createProjectOptions.files = { @@ -789,22 +789,22 @@ RED.projects = (function() { migrateProjectHeader.appendTo(container); var body = $('
').appendTo(container); - $('

').text("Setup encryption of your credentials file").appendTo(body); + $('

').text(RED._("projects.encryption-config.setup")).appendTo(body); if (options.existingProject) { - $('

').text("Your flow credentials file can be encrypted to keep its contents secure.").appendTo(body); - $('

').text("If you want to store these credentials in a public Git repository, you must encrypt them by providing a secret key phrase.").appendTo(body); + $('

').text(RED._("projects.encryption-config.desc0")).appendTo(body); + $('

').text(RED._("projects.encryption-config.desc1")).appendTo(body); } else { if (RED.settings.flowEncryptionType === 'disabled') { - $('

').text("Your flow credentials file is not currently encrypted.").appendTo(body); - $('

').text("That means its contents, such as passwords and access tokens, can be read by anyone with access to the file.").appendTo(body); - $('

').text("If you want to store these credentials in a public Git repository, you must encrypt them by providing a secret key phrase.").appendTo(body); + $('

').text(RED._("projects.encryption-config.desc2")).appendTo(body); + $('

').text(RED._("projects.encryption-config.desc3")).appendTo(body); + $('

').text(RED._("projects.encryption-config.desc4")).appendTo(body); } else { if (RED.settings.flowEncryptionType === 'user') { - $('

').text("Your flow credentials file is currently encrypted using the credentialSecret property from your settings file as the key.").appendTo(body); + $('

').text(RED._("projects.encryption-config.desc5")).appendTo(body); } else if (RED.settings.flowEncryptionType === 'system') { - $('

').text("Your flow credentials file is currently encrypted using a system-generated key. You should provide a new secret key for this project.").appendTo(body); + $('

').text(RED._("projects.encryption-config.desc6")).appendTo(body); } - $('

').text("The key will be stored separately from your project files. You will need to provide the key to use this project in another instance of Node-RED.").appendTo(body); + $('

').text(RED._("projects.encryption-config.desc7")).appendTo(body); } } @@ -832,16 +832,16 @@ RED.projects = (function() { var row = $('

').appendTo(body); - $('').appendTo(row); + $('').appendTo(row); var credentialsBox = $('
').appendTo(row); var credentialsRightBox = $('
').appendTo(credentialsBox); var credentialsLeftBox = $('
').appendTo(credentialsBox); var credentialsEnabledBox = $('
').appendTo(credentialsLeftBox); - $('').appendTo(credentialsEnabledBox); + $('').appendTo(credentialsEnabledBox); var credentialsDisabledBox = $('
').appendTo(credentialsLeftBox); - $('').appendTo(credentialsDisabledBox); + $('').appendTo(credentialsDisabledBox); credentialsLeftBox.find("input[name=projects-encryption-type]").click(function(e) { var val = $(this).val(); @@ -876,15 +876,15 @@ RED.projects = (function() { }) row = $('
').appendTo(credentialsRightBox); - $('').appendTo(row); + $('').appendTo(row); row = $('
').appendTo(credentialsRightBox); - $('').appendTo(row); + $('').appendTo(row); row = $('
').appendTo(credentialsRightBox); emptyProjectCredentialInput = $('').appendTo(row); emptyProjectCredentialInput.on("change keyup paste", validateForm); row = $('
').hide().appendTo(credentialsRightBox); - $('
The credentials file will not be encrypted and its contents easily read
').appendTo(row); + $('
'+RED._("projects.encryption-config.desc8")+'
').appendTo(row); credentialsRightBox.find("input[name=projects-encryption-key]").click(function() { var val = $(this).val(); @@ -911,14 +911,14 @@ RED.projects = (function() { return [ { // id: "clipboard-dialog-cancel", - text: "Back", + text: RED._("common.label.back"), click: function() { show('default-files',options); } }, { id: "projects-dialog-create-encryption", - text: options.existingProject?"Create project files":"Create project", // TODO: nls + text: RED._(options.existingProject?"projects.encryption-config.create-project-files":"projects.encryption-config.create-project"), class: "primary disabled", disabled: true, click: function() { @@ -966,10 +966,10 @@ RED.projects = (function() { }, 400: { 'project_exists': function(error) { - console.log("already exists"); + console.log(RED._("projects.encryption-config.already-exists")); }, 'git_error': function(error) { - console.log("git error",error); + console.log(RED._("projects.encryption-config.git-error"),error); }, 'git_connection_failed': function(error) { projectRepoInput.addClass("input-error"); @@ -978,7 +978,7 @@ RED.projects = (function() { projectRepoUserInput.addClass("input-error"); projectRepoPasswordInput.addClass("input-error"); // getRepoAuthDetails(req); - console.log("git auth error",error); + console.log(RED._("projects.encryption-config.git-auth-error"),error); }, '*': function(error) { reportUnexpectedError(error); @@ -1004,19 +1004,16 @@ RED.projects = (function() { migrateProjectHeader.appendTo(container); var body = $('
').appendTo(container); - $('

').text("You have successfully created your first project!").appendTo(body); - $('

').text("You can now continue to use Node-RED just as you always have.").appendTo(body); - $('

').text("The 'info' tab in the sidebar shows you what your current active project is. "+ - "The button next to the name can be used to access the project settings view.").appendTo(body); - $('

').text("The 'history' tab in the sidebar can be used to view files that have changed "+ - "in your project and to commit them. It shows you a complete history of your commits and "+ - "allows you to push your changes to a remote repository.").appendTo(body); + $('

').text(RED._("projects.create-success.success")).appendTo(body); + $('

').text(RED._("projects.create-success.desc0")).appendTo(body); + $('

').text(RED._("projects.create-success.desc1")).appendTo(body); + $('

').text(RED._("projects.create-success.desc2")).appendTo(body); return container; }, buttons: [ { - text: "Done", + text: RED._("common.label.done"), click: function() { $( this ).dialog( "close" ); } @@ -1043,7 +1040,7 @@ RED.projects = (function() { var selectedProject; return { - title: "Projects", // TODO: NLS + title: RED._("projects.create.projects"), content: function(options) { var projectList = null; selectedProject = null; @@ -1077,14 +1074,14 @@ RED.projects = (function() { projectNameValid = false; valid = false; if (projectList[projectName]) { - projectNameSublabel.text("Project already exists"); + projectNameSublabel.text(RED._("projects.create.already-exists")); } else { - projectNameSublabel.text("Must contain only A-Z 0-9 _ -"); + projectNameSublabel.text(RED._("projects.create.must-contain")); } } else { projectNameInput.removeClass("input-error"); $('').appendTo(projectNameStatus); - projectNameSublabel.text("Must contain only A-Z 0-9 _ -"); + projectNameSublabel.text(RED._("projects.create.must-contain")); projectNameValid = true; } projectNameLastChecked = projectName; @@ -1102,7 +1099,7 @@ RED.projects = (function() { // var validRepo = /^(?:file|git|ssh|https?|[\d\w\.\-_]+@[\w\.]+):(?:\/\/)?[\w\.@:\/~_-]+(?:\/?|\#[\d\w\.\-_]+?)$/.test(repo); var validRepo = repo.length > 0 && !/\s/.test(repo); if (/^https?:\/\/[^/]+@/i.test(repo)) { - $("#projects-dialog-screen-create-project-repo-label small").text("Do not include the username/password in the url"); + $("#projects-dialog-screen-create-project-repo-label small").text(RED._("projects.create.no-info-in-url")); validRepo = false; } if (!validRepo) { @@ -1159,10 +1156,10 @@ RED.projects = (function() { row = $('

').appendTo(container); - var openProject = $('').appendTo(row); - var createAsEmpty = $('').appendTo(row); + var openProject = $('').appendTo(row); + var createAsEmpty = $('').appendTo(row); // var createAsCopy = $('').appendTo(row); - var createAsClone = $('').appendTo(row); + var createAsClone = $('').appendTo(row); // var createAsClone = $('').appendTo(row); row.find(".projects-dialog-screen-create-type").click(function(evt) { evt.preventDefault(); @@ -1173,9 +1170,9 @@ RED.projects = (function() { validateForm(); projectNameInput.focus(); switch ($(this).data('type')) { - case "open": $("#projects-dialog-create").text("Open project"); break; - case "empty": $("#projects-dialog-create").text("Create project"); break; - case "clone": $("#projects-dialog-create").text("Clone project"); break; + case "open": $("#projects-dialog-create").text(RED._("projects.create.open")); break; + case "empty": $("#projects-dialog-create").text(RED._("projects.create.create")); break; + case "clone": $("#projects-dialog-create").text(RED._("projects.create.clone")); break; } }) @@ -1201,7 +1198,7 @@ RED.projects = (function() { }).appendTo(row); row = $('
').appendTo(container); - $('').appendTo(row); + $('').appendTo(row); var subrow = $('
').appendTo(row); projectNameInput = $('').appendTo(subrow); @@ -1231,16 +1228,16 @@ RED.projects = (function() { checkProjectName = null; },300) }); - projectNameSublabel = $('').appendTo(row).find("small"); + projectNameSublabel = $('').appendTo(row).find("small"); // Empty Project row = $('
').appendTo(container); - $('').appendTo(row); + $('').appendTo(row); projectSummaryInput = $('').appendTo(row); - $('').appendTo(row); + $('').appendTo(row); row = $('
').appendTo(container); - $('').appendTo(row); + $('').appendTo(row); subrow = $('
').appendTo(row); projectFlowFileInput = $('').val("flow.json") .on("change keyup paste",validateForm) @@ -1249,16 +1246,16 @@ RED.projects = (function() { $('').appendTo(row); row = $('
').appendTo(container); - $('').appendTo(row); + $('').appendTo(row); var credentialsBox = $('
').appendTo(row); var credentialsRightBox = $('
').appendTo(credentialsBox); var credentialsLeftBox = $('
').appendTo(credentialsBox); var credentialsEnabledBox = $('
').appendTo(credentialsLeftBox); - $('').appendTo(credentialsEnabledBox); + $('').appendTo(credentialsEnabledBox); var credentialsDisabledBox = $('
').appendTo(credentialsLeftBox); - $('').appendTo(credentialsDisabledBox); + $('').appendTo(credentialsDisabledBox); credentialsLeftBox.find("input[name=projects-encryption-type]").click(function(e) { var val = $(this).val(); @@ -1292,15 +1289,15 @@ RED.projects = (function() { }) row = $('
').appendTo(credentialsRightBox); - $('').appendTo(row); + $('').appendTo(row); // row = $('
').appendTo(credentialsRightBox); emptyProjectCredentialInput = $('').appendTo(row); emptyProjectCredentialInput.on("change keyup paste", validateForm); - $('').appendTo(row); + $('').appendTo(row); row = $('
').hide().appendTo(credentialsRightBox); - $('
The credentials file will not be encrypted and its contents easily read
').appendTo(row); + $('
'+RED._("projects.create.desc1")+'
').appendTo(row); credentialsRightBox.find("input[name=projects-encryption-key]").click(function() { var val = $(this).val(); @@ -1313,9 +1310,9 @@ RED.projects = (function() { // Clone Project row = $('
').appendTo(container); - $('').appendTo(row); + $('').appendTo(row); projectRepoInput = $('').appendTo(row); - $('').appendTo(row); + $('').appendTo(row); var projectRepoChanged = false; var lastProjectRepo = ""; @@ -1323,7 +1320,7 @@ RED.projects = (function() { projectRepoChanged = true; var repo = $(this).val(); if (lastProjectRepo !== repo) { - $("#projects-dialog-screen-create-project-repo-label small").text("https://, ssh:// or file://"); + $("#projects-dialog-screen-create-project-repo-label small").text(RED._("projects.create.protocols")); } lastProjectRepo = repo; @@ -1342,24 +1339,24 @@ RED.projects = (function() { var cloneAuthRows = $('
').hide().appendTo(container); row = $('
').hide().appendTo(cloneAuthRows); - $('
Authentication failed
').appendTo(row); + $('
'+RED._("projects.create.auth-failed")+'
').appendTo(row); // Repo credentials - username/password ---------------- row = $('
').hide().appendTo(cloneAuthRows); var subrow = $('
').appendTo(row); - $('').appendTo(subrow); + $('').appendTo(subrow); projectRepoUserInput = $('').appendTo(subrow); subrow = $('
').appendTo(row); - $('').appendTo(subrow); + $('').appendTo(subrow); projectRepoPasswordInput = $('').appendTo(subrow); // ----------------------------------------------------- // Repo credentials - key/passphrase ------------------- row = $('
').hide().appendTo(cloneAuthRows); subrow = $('
').appendTo(row); - $('').appendTo(subrow); + $('').appendTo(subrow); projectRepoSSHKeySelect = $("').appendTo(subrow); subrow = $('
').appendTo(cloneAuthRows); var sshwarningRow = $('
').hide().appendTo(subrow); - $('
Before you can clone a repository over ssh you must add an SSH key to access it.
').appendTo(sshwarningRow); + $('
'+RED._("projects.create.desc2")+'
').appendTo(sshwarningRow); subrow = $('
').appendTo(sshwarningRow); - $('').appendTo(subrow).click(function(e) { + $('').appendTo(subrow).click(function(e) { e.preventDefault(); $('#projects-dialog-cancel').click(); RED.userSettings.show('gitconfig'); @@ -1399,7 +1396,7 @@ RED.projects = (function() { // Secret - clone row = $('
').appendTo(container); - $('').appendTo(row); + $('').appendTo(row); projectSecretInput = $('').appendTo(row); @@ -1421,9 +1418,9 @@ RED.projects = (function() { buttons: function(options) { var initialLabel; switch (options.screen||"empty") { - case "open": initialLabel = "Open project"; break; - case "empty": initialLabel = "Create project"; break; - case "clone": initialLabel = "Clone project"; break; + case "open": initialLabel = RED._("projects.create.open"); break; + case "empty": initialLabel = RED._("projects.create.create"); break; + case "clone": initialLabel = RED._("projects.create.clone"); break; } return [ { @@ -1477,7 +1474,7 @@ RED.projects = (function() { }; } else { - console.log("Error! Can't get selected SSH key path."); + console.log(RED._("projects.create.cant-get-ssh-key-path")); return; } } @@ -1497,14 +1494,14 @@ RED.projects = (function() { dialog.dialog( "close" ); if (err) { if (err.error !== 'credentials_load_failed') { - console.log("unexpected_error",err) + console.log(RED._("projects.create.unexpected_error"),err) } } }) } $(".projects-dialog-screen-create-row-auth-error").hide(); - $("#projects-dialog-screen-create-project-repo-label small").text("https://, ssh:// or file://"); + $("#projects-dialog-screen-create-project-repo-label small").text(RED._("projects.create.protocols")); projectRepoUserInput.removeClass("input-error"); projectRepoPasswordInput.removeClass("input-error"); @@ -1524,22 +1521,22 @@ RED.projects = (function() { }, 400: { 'project_exists': function(error) { - console.log("already exists"); + console.log(RED._("projects.create.already-exists-2")); }, 'git_error': function(error) { - console.log("git error",error); + console.log(RED._("projects.create.git-error"),error); }, 'git_connection_failed': function(error) { projectRepoInput.addClass("input-error"); - $("#projects-dialog-screen-create-project-repo-label small").text("Connection failed"); + $("#projects-dialog-screen-create-project-repo-label small").text(RED._("projects.create.con-failed")); }, 'git_not_a_repository': function(error) { projectRepoInput.addClass("input-error"); - $("#projects-dialog-screen-create-project-repo-label small").text("Not a git repository"); + $("#projects-dialog-screen-create-project-repo-label small").text(RED._("projects.create.not-git")); }, 'git_repository_not_found': function(error) { projectRepoInput.addClass("input-error"); - $("#projects-dialog-screen-create-project-repo-label small").text("Repository not found"); + $("#projects-dialog-screen-create-project-repo-label small").text(RED._("projects.create.no-resource")); }, 'git_auth_failed': function(error) { $(".projects-dialog-screen-create-row-auth-error").show(); @@ -1619,15 +1616,15 @@ RED.projects = (function() { whitespace: "nowrap", width:"1000px" }).click(function(evt) { evt.stopPropagation(); }).appendTo(row); - $('').css({"lineHeight":"40px"}).text("Are you sure you want to delete this project?").appendTo(cover); - $('') + $('').css({"lineHeight":"40px"}).text(RED._("projects.delete.confirm")).appendTo(cover); + $('') .appendTo(cover) .click(function(e) { e.stopPropagation(); cover.remove(); done(true); }); - $('') + $('') .appendTo(cover) .click(function(e) { e.stopPropagation(); @@ -1681,7 +1678,7 @@ RED.projects = (function() { var filterTerm = ""; var searchDiv = $("
",{class:"red-ui-search-container"}).appendTo(container); - var searchInput = $('').appendTo(searchDiv).searchBox({ + var searchInput = $('').appendTo(searchDiv).searchBox({ //data-i18n="[placeholder]menu.label.searchInput" delay: 200, change: function() { @@ -1790,7 +1787,7 @@ RED.projects = (function() { $('').text(entry.name).appendTo(header); if (activeProject && activeProject.name === entry.name) { header.addClass("projects-list-entry-current"); - $('current').appendTo(header); + $(''+RED._("projects.create-project-list.current")+'').appendTo(header); if (options.canSelectActive === false) { // active project cannot be selected; so skip the rest return @@ -1852,7 +1849,7 @@ RED.projects = (function() { function requireCleanWorkspace(done) { if (RED.nodes.dirty()) { - var message = '

You have undeployed changes that will be lost.

Do you want to continue?

'; + var message = RED._("projects.require-clean.confirm"); var cleanNotification = RED.notify(message,{ type:"info", fixed: true, @@ -1867,7 +1864,7 @@ RED.projects = (function() { done(true); } },{ - text: 'Continue', + text: RED._("common.label.cont"), click: function() { cleanNotification.close(); done(false); @@ -1945,14 +1942,14 @@ RED.projects = (function() { var url = activeProject.git.remotes[xhr.responseJSON.remote||options.remote||'origin'].fetch; var message = $('
'+ - '
Authentication required for repository:
'+ + '
'+RED._("projects.send-req.auth-req")+':
'+ '
'+url+'
'+ '
'); var isSSH = false; if (/^https?:\/\//.test(url)) { - $('
'+ - '
').appendTo(message); + $('
'+ + '
').appendTo(message); } else if (/^(?:ssh|[\d\w\.\-_]+@[\w\.]+):(?:\/\/)?/.test(url)) { isSSH = true; var row = $('
').appendTo(message); @@ -1969,7 +1966,7 @@ RED.projects = (function() { } }); row = $('
').appendTo(message); - $('').appendTo(row); + $('').appendTo(row); $('').appendTo(row); } @@ -1999,7 +1996,7 @@ RED.projects = (function() { } var done = function(err) { if (err) { - console.log("Failed to update auth"); + console.log(RED._("projects.send-req.update-failed")); console.log(err); } else { sendRequest(options,body); @@ -2039,7 +2036,7 @@ RED.projects = (function() { return; } } - console.log("Unhandled error response:"); + console.log(RED._("projects.send-req.unhandled")+":"); console.log(xhr); console.log(textStatus); console.log(err); @@ -2073,7 +2070,7 @@ RED.projects = (function() { branchFilterCreateItem.addClass("input-error"); branchFilterCreateItem.find("i").addClass("fa-warning").removeClass("fa-code-fork"); } - branchFilterCreateItem.find("span").text("Invalid branch: "+branchPrefix+branchFilterTerm); + branchFilterCreateItem.find("span").text(RED._("projects.create-branch-list.invalid")+": "+branchPrefix+branchFilterTerm); } else { if (branchFilterCreateItem.hasClass("input-error")) { branchFilterCreateItem.removeClass("input-error"); @@ -2093,14 +2090,14 @@ RED.projects = (function() { if (!entry.hasOwnProperty('commit')) { branchFilterCreateItem = container; $('').appendTo(container); - $('').text("Create branch:").appendTo(container); + $('').text(RED._("projects.create-branch-list.create")+":").appendTo(container); $('
').text(entry.name).appendTo(container); } else { $('').appendTo(container); $('').text(entry.name).appendTo(container); if (entry.current) { container.addClass("selected"); - $('').text(options.currentLabel||"current").appendTo(container); + $('').text(options.currentLabel||RED._("projects.create-branch-list.current")).appendTo(container); } } container.click(function(evt) { @@ -2240,9 +2237,9 @@ RED.projects = (function() { function createDefaultFileSet() { if (!activeProject) { - throw new Error("Cannot create default file set without an active project"); + throw new Error(RED._("projects.create-default-file-set.no-active")); } else if (!activeProject.empty) { - throw new Error("Cannot create default file set on a non-empty project"); + throw new Error(RED._("projects.create-default-file-set.no-empty")); } if (!RED.user.hasPermission("projects.write")) { RED.notify(RED._("user.errors.notAuthorized"),"error"); @@ -2269,7 +2266,7 @@ RED.projects = (function() { 200: function(data) { }, 400: { 'git_error': function(error) { - console.log("git error",error); + console.log(RED._("projects.create-default-file-set.git-error"),error); }, 'missing_flow_file': function(error) { // This is a natural next error - but let the runtime event diff --git a/red/api/editor/locales/en-US/editor.json b/red/api/editor/locales/en-US/editor.json index dfcef21a6..0b7880667 100644 --- a/red/api/editor/locales/en-US/editor.json +++ b/red/api/editor/locales/en-US/editor.json @@ -10,7 +10,11 @@ "load": "Load", "save": "Save", "import": "Import", - "export": "Export" + "export": "Export", + "back": "Back", + "next": "Next", + "clone": "Clone project", + "cont": "Continue" } }, "workspace": { @@ -509,5 +513,167 @@ "modeString": "Handle as UTF-8 String", "modeArray": "Handle as JSON array", "modeDesc":"

Buffer editor

The Buffer type is stored as a JSON array of byte values. The editor will attempt to parse the entered value as a JSON array. If it is not valid JSON, it will be treated as a UTF-8 String and converted to an array of the individual character code points.

For example, a value of Hello World will be converted to the JSON array:

[72, 101, 108, 108, 111, 32, 87, 111, 114, 108, 100]

" + }, + "projects": { + "config-git": "Configure Git client", + "welcome": { + "hello": "Hello! We have introduced 'projects' to Node-RED.", + "desc0": "This is a new way for you to manage your flow files and includes version control of your flows.", + "desc1": "To get started you can create your first project or clone an existing project from a git repository.", + "desc2": "If you are not sure, you can skip this for now. You will still be able to create your first project from the 'Projects' menu at any time.", + "create": "Create Project", + "clone": "Clone Repository", + "not-right-now": "Not right now" + }, + "git-config": { + "setup": "Setup your version control client", + "desc0": "Node-RED uses the open source tool Git for version control. It tracks changes to your project files and lets you push them to remote repositories.", + "desc1": "When you commit a set of changes, Git records who made the changes with a username and email address. The Username can be anything you want - it does not need to be your real name.", + "desc2": "Your Git client is already configured with the details below.", + "desc3": "You can change these settings later under the 'Git config' tab of the settings dialog.", + "username": "Username", + "email": "Email" + }, + "project-details": { + "create": "Create your project", + "desc0": "A project is maintained as a Git repository. It makes it much easier to share your flows with others and to collaborate on them.", + "desc1": "You can create multiple projects and quickly switch between them from the editor.", + "desc2": "To begin, your project needs a name and an optional description.", + "already-exists": "Project already exists", + "must-contain": "Must contain only A-Z 0-9 _ -", + "project-name": "Project name", + "desc": "Description", + "opt": "Optional" + }, + "clone-project": { + "clone": "Clone a project", + "desc0": "If you already have a git repository containing a project, you can clone it to get started.", + "already-exists": "Project already exists", + "must-contain": "Must contain only A-Z 0-9 _ -", + "project-name": "Project name", + "no-info-in-url": "Do not include the username/password in the url", + "git-url": "Git repository URL", + "protocols": "https://, ssh:// or file://", + "auth-failed": "Authentication failed", + "username": "Username", + "passwd": "Password", + "ssh-key": "SSH Key", + "passphrase": "Passphrase", + "ssh-key-desc": "Before you can clone a repository over ssh you must add an SSH key to access it.", + "ssh-key-add": "Add an ssh key", + "credential-key": "Credentials encryption key", + "cant-get-ssh-key": "Error! Can't get selected SSH key path.", + "already-exists": "already exists", + "git-error": "git error", + "connection-failed": "Connection failed", + "not-git-repo": "Not a git repository", + "repo-not-found": "Repository not found" + }, + "default-files": { + "create": "Create your project files", + "desc0": "A project contains your flow files, a README file and a package.json file.", + "desc1": "It can contain any other files you want to maintain in the Git repository.", + "desc2": "Your existing flow and credential files will be copied into the project.", + "flow-file": "Flow file", + "credentials-file": "Credentials file" + }, + "encryption-config": { + "setup": "Setup encryption of your credentials file", + "desc0": "Your flow credentials file can be encrypted to keep its contents secure.", + "desc1": "If you want to store these credentials in a public Git repository, you must encrypt them by providing a secret key phrase.", + "desc2": "Your flow credentials file is not currently encrypted.", + "desc3": "That means its contents, such as passwords and access tokens, can be read by anyone with access to the file.", + "desc4": "If you want to store these credentials in a public Git repository, you must encrypt them by providing a secret key phrase.", + "desc5": "Your flow credentials file is currently encrypted using the credentialSecret property from your settings file as the key.", + "desc6": "Your flow credentials file is currently encrypted using a system-generated key. You should provide a new secret key for this project.", + "desc7": "The key will be stored separately from your project files. You will need to provide the key to use this project in another instance of Node-RED.", + "credentials": "Credentials", + "enable": "Enable encryption", + "disable": "Disable encryption", + "disabled": "disabled", + "copy": "Copy over existing key", + "use-custom": "Use custom key", + "desc8": "The credentials file will not be encrypted and its contents easily read", + "create-project-files": "Create project files", + "create-project": "Create project", + "already-exists": "already exists", + "git-error": "git error", + "git-auth-error": "git auth error" + }, + "create-success": { + "success": "You have successfully created your first project!", + "desc0": "You can now continue to use Node-RED just as you always have.", + "desc1": "The 'info' tab in the sidebar shows you what your current active project is. The button next to the name can be used to access the project settings view.", + "desc2": "The 'history' tab in the sidebar can be used to view files that have changed in your project and to commit them. It shows you a complete history of your commits and allows you to push your changes to a remote repository." + }, + "create": { + "projects": "Projects", + "already-exists": "Project already exists", + "must-contain": "Must contain only A-Z 0-9 _ -", + "no-info-in-url": "Do not include the username/password in the url", + "open": "Open Project", + "create": "Create Project", + "clone": "Clone Repository", + "project-name": "Project name", + "desc": "Description", + "opt": "Optional", + "flow-file": "Flow file", + "credentials": "Credentials", + "enable-encryption": "Enable encryption", + "disable-encryption": "Disable encryption", + "encryption-key": "Encryption key", + "desc0": "A phrase to secure your credentials with", + "desc1": "The credentials file will not be encrypted and its contents easily read", + "git-url": "Git repository URL", + "protocols": "https://, ssh:// or file://", + "auth-failed": "Authentication failed", + "username": "Username", + "password": "Password", + "ssh-key": "SSH Key", + "passphrase": "Passphrase", + "desc2": "Before you can clone a repository over ssh you must add an SSH key to access it.", + "add-ssh-key": "Add an ssh key", + "credentials-encryption-key": "Credentials encryption key", + "already-exists-2": "already exists", + "git-error": "git error", + "con-failed": "Connection failed", + "not-git": "Not a git repository", + "no-resource": "Repository not found", + "cant-get-ssh-key-path": "Error! Can't get selected SSH key path.", + "unexpected_error": "unexpected_error" + }, + "delete": { + "confirm": "Are you sure you want to delete this project?" + }, + "create-project-list": { + "search": "search your projects", + "current": "current" + }, + "require-clean": { + "confirm": "

You have undeployed changes that will be lost.

Do you want to continue?

" + }, + "send-req": { + "auth-req": "Authentication required for repository", + "username": "Username", + "password": "Password", + "passphrase": "Passphrase", + "update-failed": "Failed to update auth", + "unhandled": "Unhandled error response" + }, + "create-branch-list": { + "invalid": "Invalid branch", + "create": "Create branch", + "current": "current" + }, + "create-default-file-set": { + "no-active": "Cannot create default file set without an active project", + "no-empty": "Cannot create default file set on a non-empty project", + "git-error": "git error" + }, + "errors" : { + "no-username-email": "Your Git client is not configured with a username/email.", + "unexpected": "An unexpected error occurred", + "code": "code" + } } } diff --git a/red/api/editor/locales/ja/editor.json b/red/api/editor/locales/ja/editor.json index 999dc3422..46f970341 100644 --- a/red/api/editor/locales/ja/editor.json +++ b/red/api/editor/locales/ja/editor.json @@ -10,7 +10,11 @@ "load": "読み込み", "save": "保存", "import": "読み込み", - "export": "書き出し" + "export": "書き出し", + "back": "戻る", + "next": "進む", + "clone": "プロジェクトをクローン", + "cont": "続ける" } }, "workspace": { @@ -499,5 +503,167 @@ "modeString": "UTF-8文字列として処理", "modeArray": "JSON配列として処理", "modeDesc": "

バッファエディタ

バッファ型は、バイト値から成るJSON配列として格納されます。このエディタは、入力値をJSON配列として構文解析します。もし不正なJSON配列の場合、UTF-8文字列として扱い、各文字コード番号から成る配列へ変換します。

例えば、 Hello World という値を、以下のJSON配列へ変換します。

[72, 101, 108, 108, 111, 32, 87, 111, 114, 108, 100]

" + }, + "projects": { + "config-git": "Gitクライアントの設定", + "welcome": { + "hello": "こんにちは！ Node-REDで「プロジェクト」機能が利用できるようになりました。", + "desc0": "フローファイルの管理方法が刷新され、バージョン管理も可能です。", + "desc1": "まず最初にプロジェクトを作成するか、既存のGitリポジトリからプロジェクトをクローンしてください。", + "desc2": "とりあえずこの処理をスキップしてもかまいません。「プロジェクト」メニューから、いつでもプロジェクトの作成を開始できます。", + "create": "プロジェクトの作成", + "clone": "プロジェクトのクローン", + "not-right-now": "後にする" + }, + "git-config": { + "setup": "バージョン管理クライアントの設定", + "desc0": "Node-REDはオープンソースツールのGitを使ってバージョン管理を行います。Gitによりプロジェクトファイルに対する変化を記録し、外部リポジトリに保存することができます。", + "desc1": "変更をコミットする際、変更を行った人物の情報としてユーザ名とEmailアドレスをGitが記憶します。ユーザ名は本名でなくても構いません。好きな名前を使ってください。", + "desc2": "Gitクライアントの現在の設定は以下の通りです。", + "desc3": "設定ダイアログの「Git設定」タブから別途変更することもできます。", + "username": "ユーザ名", + "email": "Email" + }, + "project-details": { + "create": "プロジェクトの作成", + "desc0": "プロジェクトはGitリポジトリとして管理します。Gitリポジトリを使ってフローの共有やコラボレーションが簡単にできます。", + "desc1": "複数のプロジェクトを作成し、エディタから即座に変更できます。", + "desc2": "まず、プロジェクト名と説明(任意)を指定してください。", + "already-exists": "既に存在するプロジェクトです", + "must-contain": "A-Z 0-9 _ - のみ指定可能", + "project-name": "プロジェクト名", + "desc": "説明", + "opt": "任意" + }, + "clone-project": { + "clone": "プロジェクトをクローン", + "desc0": "プロジェクトを含んだGitリポジトリを作成済みの場合、クローンを作成することができます。", + "already-exists": "既に存在するプロジェクトです", + "must-contain": "A-Z 0-9 _ - のみ指定可能", + "project-name": "プロジェクト名", + "no-info-in-url": "URLにユーザ名/パスワードを含めないようにしてください", + "git-url": "GitリポジトリのURL", + "protocols": "https://, ssh:// もしくは file://", + "auth-failed": "認証に失敗しました", + "username": "ユーザ名", + "passwd": "パスワード", + "ssh-key": "SSHキー", + "passphrase": "パスフレーズ", + "ssh-key-desc": "SSHでリポジトリをクローンする前にSSHキーを追加してください。", + "ssh-key-add": "SSHキーの追加", + "credential-key": "認証情報の暗号化キー", + "cant-get-ssh-key": "エラー! 選択したSSHキーのパスを取得できません。", + "already-exists": "既に存在します", + "git-error": "Gitエラー", + "connection-failed": "接続に失敗しました", + "not-git-repo": "Gitリポジトリではありません", + "repo-not-found": "リポジトリが見つかりません" + }, + "default-files": { + "create": "プロジェクト関連ファアイルの作成", + "desc0": "プロジェクトはフローファイル、README、package.jsonを含みます。", + "desc1": "その他、Gitリポジトリで管理したいファイルを含めても構いません。", + "desc2": "既存のフローと認証情報ファイルをプロジェクトにコピーします。", + "flow-file": "フローファイル", + "credentials-file": "認証情報ファイル" + }, + "encryption-config": { + "setup": "認証情報ファイルの暗号化設定", + "desc0": "フロー認証情報ファイルを暗号化して内容の安全性を担保できます。", + "desc1": "認証情報を公開Gitリポジトリに保存する際には、秘密キーフレーズによって暗号化します。", + "desc2": "認証情報ファイルは暗号化されていません。", + "desc3": "パスワードやアクセストークンといった認証情報を他人が参照できます。", + "desc4": "認証情報を公開Gitリポジトリに保存する際には、秘密キーフレーズによって暗号化します。", + "desc5": "フロー認証情報ファイルはsettingsファイルのcredentialSecretプロパティで暗号化されています。", + "desc6": "フロー認証情報ファイルはシステムが生成したキーによって暗号化されています。このプロジェクト用に新しい秘密キーを指定してください。", + "desc7": "キーはプロジェクトファイルとば別に保存されます。他のNode-REDでこのプロジェクトを利用するには、このプロジェクトのキーが必要です。", + "credentials": "認証情報", + "enable": "暗号化を有効にする", + "disable": "暗号化を無効にする", + "disabled": "無効", + "copy": "既存のキーをコピー", + "use-custom": "カスタムキーを使用", + "desc8": "認証情報ファイルが暗号化されないため、簡単に読み出すことができます。", + "create-project-files": "プロジェクト関連ファイル作成", + "create-project": "プロジェクト作成", + "already-exists": "既に存在", + "git-error": "Gitエラー", + "git-auth-error": "Git認証エラー" + }, + "create-success": { + "success": "最初のプロジェクトの作成が成功しました!", + "desc0": "以降は、これまでと同様にNode-REDを利用できます。", + "desc1": "サイドバーの「情報」タブに現在選択されたプロジェクトを表示します。プロジェクト名の隣のボタンでプロジェクト設定画面を呼び出すことができます。", + "desc2": "サイドバーの「履歴」タブで変更が加えられたプロジェクト内のファイルを確認しコミットできます。このサイドバーでは、全てのコミット履歴を確認し、変更を外部リポジトリにプッシュすることが可能です。" + }, + "create": { + "projects": "プロジェクト", + "already-exists": "プロジェクトは既に存在します", + "must-contain": "A-Z 0-9 _ - のみ指定可能", + "no-info-in-url": "URLにユーザ名/パスワードを含めないようにしてください", + "open": "プロジェクトを開く", + "create": "プロジェクトを作成", + "clone": "プロジェクトをクローン", + "project-name": "プロジェクト名", + "desc": "説明", + "opt": "任意", + "flow-file": "フローファイル", + "credentials": "認証情報", + "enable-encryption": "暗号化を有効にする", + "disable-encryption": "暗号化を無効にする", + "encryption-key": "暗号化キー", + "desc0": "認証情報をセキュアにするためのフレーズ", + "desc1": "認証情報ファイルが暗号化されないため、簡単に読み出すことができます", + "git-url": "GitリポジトリのURL", + "protocols": "https://, ssh:// もしくは file://", + "auth-failed": "認証に失敗しました", + "username": "ユーザ名", + "password": "パスワード", + "ssh-key": "SSHキー", + "passphrase": "パスフレーズ", + "desc2": "SSHでリポジトリをクローンする前にSSHキーを追加してください。", + "add-ssh-key": "SSHキーの追加", + "credentials-encryption-key": "認証情報の暗号化キー", + "already-exists-2": "既に存在します", + "git-error": "Gitエラー", + "con-failed": "接続に失敗しました", + "not-git": "Gitリポジトリではありません", + "no-resource": "リポジトリが見つかりません", + "cant-get-ssh-key-path": "エラー! 選択したSSHキーのパスを取得できません。", + "unexpected_error": "予期しないエラー" + }, + "delete": { + "confirm": "プロジェクトを削除しても良いですか?" + }, + "create-project-list": { + "search": "プロジェクトを検索", + "current": "有効" + }, + "require-clean": { + "confirm": "

デプロイされていない変更は失われます。

続けますか?

" + }, + "send-req": { + "auth-req": "リポジトリ対する認証が必要です", + "username": "ユーザ名", + "password": "パスワード", + "passphrase": "パスフレーズ", + "update-failed": "認証の更新に失敗しました", + "unhandled": "エラー応答が処理されませんでした" + }, + "create-branch-list": { + "invalid": "不正なブランチ", + "create": "ブランチの作成", + "current": "有効" + }, + "create-default-file-set": { + "no-active": "有効なプロジェクトが無い場合、デフォルトのファイル群を作成できません。", + "no-empty": "デフォルトのファイル群を空でないプロジェクトに作成することはできません。", + "git-error": "Gitエラー" + }, + "errors" : { + "no-username-email": "Gitクライアントのユーザ名/emailが設定されていません。", + "unexpected": "予期しないエラーが発生しました", + "code": "コード" + } } } From 865853da1901b307766432449443acff8cfebd57 Mon Sep 17 00:00:00 2001 From: Hiroyasu Nishiyama Date: Sat, 26 May 2018 20:08:39 +0900 Subject: [PATCH 19/34] add some i18n support for main editor interface and Japanese message catalogue --- editor/js/main.js | 40 ++++++++++++------------ red/api/editor/locales/en-US/editor.json | 24 +++++++++++++- red/api/editor/locales/ja/editor.json | 27 ++++++++++++++-- 3 files changed, 68 insertions(+), 23 deletions(-) diff --git a/editor/js/main.js b/editor/js/main.js index e65b8f30a..80e0a692f 100644 --- a/editor/js/main.js +++ b/editor/js/main.js @@ -153,13 +153,13 @@ loadFlows(function() { var project = RED.projects.getActiveProject(); var message = { - "change-branch":"Change to local branch '"+project.git.branches.local+"'", - "merge-abort":"Git merge aborted", - "loaded":"Project '"+msg.project+"' loaded", - "updated":"Project '"+msg.project+"' updated", - "pull":"Project '"+msg.project+"' reloaded", - "revert": "Project '"+msg.project+"' reloaded", - "merge-complete":"Git merge completed" + "change-branch": RED._("notification.project.change-branch", {project: project.git.branches.local}), + "merge-abort": RED._("notification.project.merge-abort"), + "loaded": RED._("notification.project.loaded", {project: msg.project}), + "updated": RED._("notification.project.updated", {project: msg.project}), + "pull": RED._("notification.project.pull", {project: msg.project}), + "revert": RED._("notification.project.revert", {project: msg.project}), + "merge-complete": RED._("notification.project.merge-complete") }[msg.action]; RED.notify("

"+message+"

"); RED.sidebar.info.refresh() @@ -183,7 +183,7 @@ if (!!RED.projects.getActiveProject()) { options.buttons = [ { - text: "Manage project dependencies", + text: RED._("notification.label.manage-project-dep"), click: function() { persistentNotifications[notificationId].hideNotification(); RED.projects.settings.show('deps'); @@ -194,7 +194,7 @@ } else { options.buttons = [ { - text: "Close", + text: RED._("common.label.close"), click: function() { persistentNotifications[notificationId].hideNotification(); } @@ -207,7 +207,7 @@ if (RED.user.hasPermission("projects.write")) { options.buttons = [ { - text: "Setup credentials", + text: RED._("notification.label.setup-cred"), click: function() { persistentNotifications[notificationId].hideNotification(); RED.projects.showCredentialsPrompt(); @@ -218,7 +218,7 @@ } else { options.buttons = [ { - text: "Close", + text: RED._("common.label.close"), click: function() { persistentNotifications[notificationId].hideNotification(); } @@ -229,7 +229,7 @@ if (RED.user.hasPermission("projects.write")) { options.buttons = [ { - text: "Setup project files", + text: RED._("notification.label.setup-project"), click: function() { persistentNotifications[notificationId].hideNotification(); RED.projects.showFilesPrompt(); @@ -241,7 +241,7 @@ if (RED.user.hasPermission("projects.write")) { options.buttons = [ { - text: "Create default package file", + text: RED._("notification.label.create-default-package"), click: function() { persistentNotifications[notificationId].hideNotification(); RED.projects.createDefaultPackageFile(); @@ -253,13 +253,13 @@ if (RED.user.hasPermission("projects.write")) { options.buttons = [ { - text: "No thanks", + text: RED._("notification.label.no-thanks"), click: function() { persistentNotifications[notificationId].hideNotification(); } }, { - text: "Create default project files", + text: RED._("notification.label.create-default-project"), click: function() { persistentNotifications[notificationId].hideNotification(); RED.projects.createDefaultFileSet(); @@ -273,7 +273,7 @@ if (RED.user.hasPermission("projects.write")) { options.buttons = [ { - text: "Show merge conflicts", + text: RED._("notification.label.show-merge-conflicts"), click: function() { persistentNotifications[notificationId].hideNotification(); RED.sidebar.versionControl.showLocalChanges(); @@ -382,10 +382,10 @@ function loadEditor() { var menuOptions = []; if (RED.settings.theme("projects.enabled",false)) { - menuOptions.push({id:"menu-item-projects-menu",label:"Projects",options:[ - {id:"menu-item-projects-new",label:"New",disabled:false,onselect:"core:new-project"}, - {id:"menu-item-projects-open",label:"Open",disabled:false,onselect:"core:open-project"}, - {id:"menu-item-projects-settings",label:"Project Settings",disabled:false,onselect:"core:show-project-settings"} + menuOptions.push({id:"menu-item-projects-menu",label:RED._("menu.label.projects"),options:[ + {id:"menu-item-projects-new",label:RED._("menu.label.projects-new"),disabled:false,onselect:"core:new-project"}, + {id:"menu-item-projects-open",label:RED._("menu.label.projects-open"),disabled:false,onselect:"core:open-project"}, + {id:"menu-item-projects-settings",label:RED._("menu.label.projects-settings"),disabled:false,onselect:"core:show-project-settings"} ]}); } diff --git a/red/api/editor/locales/en-US/editor.json b/red/api/editor/locales/en-US/editor.json index dfcef21a6..ed7b7c2dc 100644 --- a/red/api/editor/locales/en-US/editor.json +++ b/red/api/editor/locales/en-US/editor.json @@ -67,7 +67,11 @@ "editPalette":"Manage palette", "other": "Other", "showTips": "Show tips", - "help": "Node-RED website" + "help": "Node-RED website", + "projects": "Projects", + "projects-new": "New", + "projects-open": "Open", + "projects-settings": "Project Settings" } }, "user": { @@ -108,6 +112,24 @@ "cannotAddCircularReference": "Cannot add subflow - circular reference detected", "unsupportedVersion": "

Using an unsupported version of Node.js

You should upgrade to the latest Node.js LTS release

", "failedToAppendNode": "

Failed to load '__module__'

__error__

" + }, + "project": { + "change-branch": "Change to local branch '__project__'", + "merge-abort": "Git merge aborted", + "loaded": "Project '__project__' loaded", + "updated": "Project '__project__' updated", + "pull": "Project '__project__' reloaded", + "revert": "Project '__project__' reloaded", + "merge-complete": "Git merge completed" + }, + "label": { + "manage-project-dep": "Manage project dependencies", + "setup-cred": "Setup credentials", + "setup-project": "Setup project files", + "create-default-package": "Create default package file", + "no-thanks": "No thanks", + "create-default-project": "Create default project files", + "show-merge-conflicts": "Show merge conflicts" } }, "clipboard": { diff --git a/red/api/editor/locales/ja/editor.json b/red/api/editor/locales/ja/editor.json index 999dc3422..ac17f9a75 100644 --- a/red/api/editor/locales/ja/editor.json +++ b/red/api/editor/locales/ja/editor.json @@ -67,7 +67,11 @@ "editPalette": "パレットの管理", "other": "その他", "showTips": "ヒントを表示", - "help": "Node-REDウェブサイト" + "help": "Node-REDウェブサイト", + "projects": "プロジェクト", + "projects-new": "新規", + "projects-open": "開く", + "projects-settings": "設定" } }, "user": { @@ -102,7 +106,26 @@ "lostConnectionTry": "すぐに接続", "cannotAddSubflowToItself": "サブフロー自身を追加できません", "cannotAddCircularReference": "循環参照を検出したため、サブフローを追加できません", - "unsupportedVersion": "サポートされていないバージョンのNode.jsを使用しています。
最新のNode.js LTSに更新してください。" + "unsupportedVersion": "サポートされていないバージョンのNode.jsを使用しています。
最新のNode.js LTSに更新してください。", + "failedToAppendNode": "

'__module__'がロードできませんでした。

__error__

" + }, + "project": { + "change-branch": "ローカルブランチ'__project__'に変更しました", + "merge-abort": "Gitマージを中止しました", + "loaded": "プロジェクト'__project__'をロードしました", + "updated": "プロジェクト'__project__'を更新しました", + "pull": "プロジェクト'__project__'を再ロードしました", + "revert": "プロジェクト'__project__'を再ロードしました", + "merge-complete": "Gitマージが完了しました" + }, + "label": { + "manage-project-dep": "プロジェクトの依存関係の管理", + "setup-cred": "認証情報の設定", + "setup-project": "プロジェクトファイルの設定", + "create-default-package": "デフォルトパッケージファイルの作成", + "no-thanks": "不要", + "create-default-project": "デフォルトプロジェクトファイルの作成", + "show-merge-conflicts": "マージ競合を表示" } }, "clipboard": { From 0ad54cc2d1270c6074643fe09933c6bfc4259642 Mon Sep 17 00:00:00 2001 From: Hiroyasu Nishiyama Date: Sun, 27 May 2018 01:05:50 +0900 Subject: [PATCH 20/34] allow i18n translation in runtime --- red/runtime/i18n.js | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/red/runtime/i18n.js b/red/runtime/i18n.js index fc3599c87..336a2c9a6 100644 --- a/red/runtime/i18n.js +++ b/red/runtime/i18n.js @@ -81,16 +81,32 @@ var MessageFileLoader = { } +function current_locale() { + var env = process.env; + for (var name of ['LC_ALL', 'LC_MESSAGES', 'LANG']) { + if (name in env) { + var val = env[name]; + return val.substring(0, 2); + } + } + return undefined; +} + function init() { return when.promise(function(resolve,reject) { i18n.backend(MessageFileLoader); - i18n.init({ + var opt = { ns: { namespaces: [], defaultNs: "runtime" }, fallbackLng: [defaultLang] - },function() { + }; + var lang = current_locale(); + if (lang) { + opt.lng = lang; + } + i18n.init(opt ,function() { resolve(); }); }); From 4565342b057e7d9d354969b8148eee245f4cfed3 Mon Sep 17 00:00:00 2001 From: Hiroyasu Nishiyama Date: Sun, 27 May 2018 01:38:54 +0900 Subject: [PATCH 21/34] add i18n support for project default files generation --- red/runtime/locales/en-US/runtime.json | 4 +++- red/runtime/locales/ja/runtime.json | 10 ++++++++++ .../storage/localfilesystem/projects/Project.js | 4 ++-- .../localfilesystem/projects/defaultFileSet.js | 11 ++++++----- 4 files changed, 21 insertions(+), 8 deletions(-) create mode 100644 red/runtime/locales/ja/runtime.json diff --git a/red/runtime/locales/en-US/runtime.json b/red/runtime/locales/en-US/runtime.json index 2b04a26b7..6e9f057ae 100644 --- a/red/runtime/locales/en-US/runtime.json +++ b/red/runtime/locales/en-US/runtime.json @@ -150,7 +150,9 @@ "disabled": "Projects disabled : editorTheme.projects.enabled=false", "disabledNoFlag": "Projects disabled : set editorTheme.projects.enabled=true to enable", "git-not-found": "Projects disabled : git command not found", - "git-version-old": "Projects disabled : git __version__ not supported. Requires 2.x" + "git-version-old": "Projects disabled : git __version__ not supported. Requires 2.x", + "summary": "A Node-RED Project", + "readme": "### About\n\nThis is your project's README.md file. It helps users understand what your\nproject does, how to use it and anything else they may need to know." } } } diff --git a/red/runtime/locales/ja/runtime.json b/red/runtime/locales/ja/runtime.json new file mode 100644 index 000000000..87e3fe0cb --- /dev/null +++ b/red/runtime/locales/ja/runtime.json @@ -0,0 +1,10 @@ +{ + "storage": { + "localfilesystem": { + "projects": { + "summary": "Node-REDプロジェクト", + "readme": "### 説明\nこれはプロジェクトのREADME.mdファイルです。このファイルには、\nプロジェクトの説明、利用方法、その他の情報を記載します。" + } + } + } +} diff --git a/red/runtime/storage/localfilesystem/projects/Project.js b/red/runtime/storage/localfilesystem/projects/Project.js index 8ba85f768..989774d6c 100644 --- a/red/runtime/storage/localfilesystem/projects/Project.js +++ b/red/runtime/storage/localfilesystem/projects/Project.js @@ -162,7 +162,7 @@ Project.prototype.initialise = function(user,data) { if (defaultFileSet.hasOwnProperty(file)) { var path = fspath.join(project.path,file); if (!fs.existsSync(path)) { - promises.push(util.writeFile(path,defaultFileSet[file](project))); + promises.push(util.writeFile(path,defaultFileSet[file](project, runtime))); } } @@ -850,7 +850,7 @@ function createDefaultProject(user, project) { } for (var file in defaultFileSet) { if (defaultFileSet.hasOwnProperty(file)) { - promises.push(util.writeFile(fspath.join(projectPath,file),defaultFileSet[file](project))); + promises.push(util.writeFile(fspath.join(projectPath,file),defaultFileSet[file](project, runtime))); } } diff --git a/red/runtime/storage/localfilesystem/projects/defaultFileSet.js b/red/runtime/storage/localfilesystem/projects/defaultFileSet.js index 12368ec75..a7e825207 100644 --- a/red/runtime/storage/localfilesystem/projects/defaultFileSet.js +++ b/red/runtime/storage/localfilesystem/projects/defaultFileSet.js @@ -15,10 +15,11 @@ **/ module.exports = { - "package.json": function(project) { + "package.json": function(project, runtime) { + var i18n = runtime.i18n; var package = { "name": project.name, - "description": project.summary||"A Node-RED Project", + "description": project.summary||i18n._("storage.localfilesystem.projects.summary"), "version": "0.0.1", "dependencies": {}, "node-red": { @@ -34,13 +35,13 @@ module.exports = { } return JSON.stringify(package,"",4); }, - "README.md": function(project) { + "README.md": function(project, runtime) { + var i18n = runtime.i18n; var content = project.name+"\n"+("=".repeat(project.name.length))+"\n\n"; if (project.summary) { content += project.summary+"\n\n"; } - content += "### About\n\nThis is your project's README.md file. It helps users understand what your\nproject does, how to use it and anything else they may need to know."; - + content += i18n._("storage.localfilesystem.projects.readme"); return content; }, ".gitignore": function() { return "*.backup" ;} From a84b2ab5bbbfba50a92e50ef5af0fbfdc6f42e62 Mon Sep 17 00:00:00 2001 From: Hiroyasu Nishiyama Date: Sun, 27 May 2018 22:30:05 +0900 Subject: [PATCH 22/34] update defaultFileSet test for i18n support --- .../localfilesystem/projects/defaultFileSet_spec.js | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/test/red/runtime/storage/localfilesystem/projects/defaultFileSet_spec.js b/test/red/runtime/storage/localfilesystem/projects/defaultFileSet_spec.js index 130e5c15b..71ec8adc1 100644 --- a/test/red/runtime/storage/localfilesystem/projects/defaultFileSet_spec.js +++ b/test/red/runtime/storage/localfilesystem/projects/defaultFileSet_spec.js @@ -19,6 +19,13 @@ var should = require("should"); var defaultFileSet = require("../../../../../../red/runtime/storage/localfilesystem/projects/defaultFileSet"); describe('storage/localfilesystem/projects/defaultFileSet', function() { + var runtime = { + i18n: { + "_": function(name) { + return name; + } + } + }; it('generates package.json for a project', function() { var generated = defaultFileSet["package.json"]({ name: "A TEST NAME", @@ -27,7 +34,7 @@ describe('storage/localfilesystem/projects/defaultFileSet', function() { flow: "MY FLOW FILE", credentials: "MY CREDENTIALS FILE" } - }); + }, runtime); var parsed = JSON.parse(generated); parsed.should.have.property('name',"A TEST NAME"); @@ -42,7 +49,7 @@ describe('storage/localfilesystem/projects/defaultFileSet', function() { var generated = defaultFileSet["README.md"]({ name: "A TEST NAME", summary: "A TEST SUMMARY" - }); + }, runtime); generated.should.match(/A TEST NAME/); generated.should.match(/A TEST SUMMARY/); }); @@ -50,7 +57,7 @@ describe('storage/localfilesystem/projects/defaultFileSet', function() { var generated = defaultFileSet[".gitignore"]({ name: "A TEST NAME", summary: "A TEST SUMMARY" - }); + }, runtime); generated.length.should.be.greaterThan(0); }); }); From b2cca10e8ba5f42cacd41eae93fafb9bcb66a5d3 Mon Sep 17 00:00:00 2001 From: Kazuki-Nakanishi Date: Mon, 28 May 2018 17:01:53 +0900 Subject: [PATCH 23/34] Add i18n support for version control of project --- editor/js/ui/projects/tab-versionControl.js | 131 ++++++++++---------- red/api/editor/locales/en-US/editor.json | 69 ++++++++++- red/api/editor/locales/ja/editor.json | 68 ++++++++++ 3 files changed, 203 insertions(+), 65 deletions(-) diff --git a/editor/js/ui/projects/tab-versionControl.js b/editor/js/ui/projects/tab-versionControl.js index 4560a56e5..c5db3f251 100644 --- a/editor/js/ui/projects/tab-versionControl.js +++ b/editor/js/ui/projects/tab-versionControl.js @@ -52,11 +52,11 @@ RED.sidebar.versionControl = (function() { 200: function(data) { var title; if (state === 'unstaged') { - title = 'Unstaged changes : '+entry.file + title = RED._("sidebar.project.versionControl.unstagedChanges")+' : '+entry.file } else if (state === 'staged') { - title = 'Staged changes : '+entry.file + title = RED._("sidebar.project.versionControl.stagedChanges")+' : '+entry.file } else { - title = 'Resolve conflicts : '+entry.file + title = RED._("sidebar.project.versionControl.resolveConflicts")+' : '+entry.file } var options = { diff: data.diff, @@ -65,18 +65,18 @@ RED.sidebar.versionControl = (function() { project: activeProject } if (state == 'unstaged') { - options.oldRevTitle = entry.indexStatus === " "?"HEAD":"Staged"; - options.newRevTitle = "Unstaged"; + options.oldRevTitle = entry.indexStatus === " "?RED._("sidebar.project.versionControl.head"):RED._("sidebar.project.versionControl.staged"); + options.newRevTitle = RED._("sidebar.project.versionControl.unstaged"); options.oldRev = entry.indexStatus === " "?"@":":0"; options.newRev = "_"; } else if (state === 'staged') { - options.oldRevTitle = "HEAD"; - options.newRevTitle = "Staged"; + options.oldRevTitle = RED._("sidebar.project.versionControl.head"); + options.newRevTitle = RED._("sidebar.project.versionControl.staged"); options.oldRev = "@"; options.newRev = ":0"; } else { - options.oldRevTitle = "Local"; - options.newRevTitle = "Remote"; + options.oldRevTitle = RED._("sidebar.project.versionControl.local"); + options.newRevTitle = RED._("sidebar.project.versionControl.remote"); options.commonRev = ":1"; options.oldRev = ":2"; options.newRev = ":3"; @@ -156,7 +156,7 @@ RED.sidebar.versionControl = (function() { evt.preventDefault(); var spinner = utils.addSpinnerOverlay(container).addClass('projects-dialog-spinner-contain'); - var notification = RED.notify("Are you sure you want to revert the changes to '"+entry.file+"'? This cannot be undone.", { + var notification = RED.notify(RED._("sidebar.project.versionControl.revert",{file:entry.file}), { type: "warning", modal: true, fixed: true, @@ -168,7 +168,7 @@ RED.sidebar.versionControl = (function() { notification.close(); } },{ - text: 'Revert changes', + text: RED._("sidebar.project.versionControl.revertChanges"), click: function() { notification.close(); var activeProject = RED.projects.getActiveProject(); @@ -281,6 +281,8 @@ RED.sidebar.versionControl = (function() { entry["update"+((state==='unstaged')?"Unstaged":"Staged")](entry, status); } var utils; + var emptyStagedItem; + var emptyMergedItem; function init(_utils) { utils = _utils; @@ -312,7 +314,7 @@ RED.sidebar.versionControl = (function() { }); localChanges = sections.add({ - title: "Local Changes", + title: RED._("sidebar.project.versionControl.localChanges"), collapsible: true }); localChanges.expand(); @@ -326,10 +328,12 @@ RED.sidebar.versionControl = (function() { refresh(true); }) + emptyStagedItem = { label: RED._("sidebar.project.versionControl.none") }; + emptyMergedItem = { label: RED._("sidebar.project.versionControl.conflictResolve") }; var unstagedContent = $('
').appendTo(localChanges.content); - var header = $('
Local files
').appendTo(unstagedContent); - stageAllButton = $('') + var header = $('
'+RED._("sidebar.project.versionControl.localFiles")+'
').appendTo(unstagedContent); + stageAllButton = $('') .appendTo(header) .click(function(evt) { evt.preventDefault(); @@ -359,9 +363,9 @@ RED.sidebar.versionControl = (function() { unmergedContent = $('
').appendTo(localChanges.content); - header = $('
Unmerged changes
').appendTo(unmergedContent); + header = $('
'+RED._("sidebar.project.versionControl.unmergedChanges")+'
').appendTo(unmergedContent); bg = $('
').appendTo(header); - var abortMergeButton = $('') + var abortMergeButton = $('') .appendTo(bg) .click(function(evt) { evt.preventDefault(); @@ -399,7 +403,7 @@ RED.sidebar.versionControl = (function() { addItem: function(row,index,entry) { if (entry === emptyMergedItem) { entry.button = { - label: 'commit', + label: RED._("sidebar.project.versionControl.commit"), click: function(evt) { evt.preventDefault(); evt.stopPropagation(); @@ -423,7 +427,7 @@ RED.sidebar.versionControl = (function() { var stagedContent = $('
').appendTo(localChanges.content); - header = $('
Changes to commit
').appendTo(stagedContent); + header = $('
'+RED._("sidebar.project.versionControl.changeToCommit")+'
').appendTo(stagedContent); bg = $('
').appendTo(header); var showCommitBox = function() { @@ -446,14 +450,14 @@ RED.sidebar.versionControl = (function() { abortMergeButton.attr("disabled",true); commitMessage.focus(); } - commitButton = $('') + commitButton = $('') .appendTo(bg) .click(function(evt) { evt.preventDefault(); evt.stopPropagation(); showCommitBox(); }); - unstageAllButton = $('') + unstageAllButton = $('') .appendTo(bg) .click(function(evt) { evt.preventDefault(); @@ -480,14 +484,14 @@ RED.sidebar.versionControl = (function() { commitBox = $('
').hide().appendTo(localChanges.content); - var commitMessage = $('') + var commitMessage = $('') .appendTo(commitBox) .on("change keyup paste",function() { submitCommitButton.attr('disabled',$(this).val().trim()===""); }); var commitToolbar = $('
').appendTo(commitBox); - var cancelCommitButton = $('') + var cancelCommitButton = $('') .appendTo(commitToolbar) .click(function(evt) { evt.preventDefault(); @@ -505,7 +509,7 @@ RED.sidebar.versionControl = (function() { abortMergeButton.attr("disabled",false); }) - var submitCommitButton = $('') + var submitCommitButton = $('') .appendTo(commitToolbar) .click(function(evt) { evt.preventDefault(); @@ -541,7 +545,7 @@ RED.sidebar.versionControl = (function() { var localHistory = sections.add({ - title: "Commit History", + title: RED._("sidebar.project.versionControl.commitHistory"), collapsible: true }); @@ -555,7 +559,7 @@ RED.sidebar.versionControl = (function() { var localBranchToolbar = $('
').appendTo(localHistory.content); - var localBranchButton = $('') + var localBranchButton = $('') .appendTo(localBranchToolbar) .click(function(evt) { evt.preventDefault(); @@ -612,7 +616,7 @@ RED.sidebar.versionControl = (function() { row.addClass('sidebar-version-control-commit-entry'); if (entry.url) { row.addClass('sidebar-version-control-commit-more'); - row.text("+ "+(entry.total-entry.totalKnown)+" more commit(s)"); + row.text("+ "+(entry.total-entry.totalKnown)+RED._("sidebar.project.versionControl.moreCommits")); row.click(function(e) { e.preventDefault(); getCommits(entry.url,localCommitList,row,entry.limit,entry.before); @@ -626,8 +630,8 @@ RED.sidebar.versionControl = (function() { result.parents = entry.parents; result.oldRev = entry.sha+"~1"; result.newRev = entry.sha; - result.oldRevTitle = "Commit "+entry.sha.substring(0,7)+"~1"; - result.newRevTitle = "Commit "+entry.sha.substring(0,7); + result.oldRevTitle = RED._("sidebar.project.versionControl.commitCapital")+" "+entry.sha.substring(0,7)+"~1"; + result.newRevTitle = RED._("sidebar.project.versionControl.commitCapital")+" "+entry.sha.substring(0,7); result.date = humanizeSinceDate(parseInt(entry.date)); RED.diff.showCommitDiff(result); }); @@ -666,10 +670,10 @@ RED.sidebar.versionControl = (function() { } var localBranchBox = $('
').hide().appendTo(localHistory.content); - $('
').text("Change local branch").appendTo(localBranchBox); + $('
').text(RED._("sidebar.project.versionControl.changeLocalBranch")).appendTo(localBranchBox); var localBranchList = utils.createBranchList({ - placeholder: "Find or create a branch", + placeholder: RED._("sidebar.project.versionControl.createBranchPlaceholder"), container: localBranchBox, onselect: function(body) { if (body.current) { @@ -701,7 +705,7 @@ RED.sidebar.versionControl = (function() { 400: { 'git_local_overwrite': function(error) { spinner.remove(); - RED.notify("You have local changes that would be overwritten by changing the branch. You must either commit or undo those changes first.",{ + RED.notify(RED._("sidebar.project.versionControl.localOverwrite"),{ type:'error', timeout: 8000 }); @@ -744,10 +748,10 @@ RED.sidebar.versionControl = (function() { },200); } } - $('
').text("Manage remote branch").appendTo(remoteBox); + $('
').text(RED._("sidebar.project.versionControl.manageRemoteBranch")).appendTo(remoteBox); var remoteBranchRow = $('
').appendTo(remoteBox); - var remoteBranchButton = $('') + var remoteBranchButton = $('') .appendTo(remoteBranchRow) .click(function(evt) { evt.preventDefault(); @@ -770,9 +774,9 @@ RED.sidebar.versionControl = (function() { var errorMessage = $('').hide().appendTo(remoteBox); - $('
Unable to access remote repository
').appendTo(errorMessage) + $('
'+RED._("sidebar.project.versionControl.unableToAccess")+'
').appendTo(errorMessage) var buttonRow = $('
').appendTo(errorMessage); - $('') + $('') .appendTo(buttonRow) .click(function(e) { e.preventDefault(); @@ -810,12 +814,12 @@ RED.sidebar.versionControl = (function() { }); }) - $('
').appendTo(remoteBox); + $('
').appendTo(remoteBox); var remoteBranchSubRow = $('
').hide().appendTo(remoteBranchRow); var remoteBranchList = utils.createBranchList({ - placeholder: "Find or create a remote branch", - currentLabel: "upstream", + placeholder: RED._("sidebar.project.versionControl.createRemoteBranchPlaceholder"), + currentLabel: RED._("sidebar.project.versionControl.upstream"), remote: function() { var project = RED.projects.getActiveProject(); var remotes = Object.keys(project.git.remotes); @@ -845,11 +849,11 @@ RED.sidebar.versionControl = (function() { }) } else { if (!activeProject.git.branches.remote) { - $('#sidebar-version-control-repo-toolbar-message').text("The created branch will be set as the tracked upstream branch."); + $('#sidebar-version-control-repo-toolbar-message').text(RED._("sidebar.project.versionControl.trackedUpstreamBranch")); $("#sidebar-version-control-repo-toolbar-set-upstream").prop('checked',true); $("#sidebar-version-control-repo-toolbar-set-upstream").prop('disabled',true); } else { - $('#sidebar-version-control-repo-toolbar-message').text("The branch will be created. Select below to set it as the tracked upstream branch."); + $('#sidebar-version-control-repo-toolbar-message').text(RED._("sidebar.project.versionControl.selectUpstreamBranch")); } $("#sidebar-version-control-repo-pull").attr('disabled',true); $("#sidebar-version-control-repo-push").attr('disabled',false); @@ -861,7 +865,7 @@ RED.sidebar.versionControl = (function() { var row = $('
').appendTo(remoteBox); - $('') + $('') .appendTo(row) .click(function(e) { e.preventDefault(); @@ -893,8 +897,7 @@ RED.sidebar.versionControl = (function() { }, 400: { 'git_push_failed': function(err) { - // TODO: better message + NLS - RED.notify("NLS: Push failed as the remote has more recent commits. Pull first and write a better error message!","error"); + RED.notify(RED._("sidebar.project.versionControl.pushFailed"),"error"); }, 'unexpected_error': function(error) { console.log(error); @@ -945,18 +948,18 @@ RED.sidebar.versionControl = (function() { }, 400: { 'git_local_overwrite': function(err) { - RED.notify("

Unable to pull remote changes; your unstaged local changes would be overwritten.

Commit your changes and try again.

"+ - '

'+'Show unstaged changes'+'

',"error",false,10000000); + RED.notify(RED._("sidebar.project.versionControl.unablePull")+ + '

'+RED._("sidebar.project.versionControl.showUnstagedChanges")+'

',"error",false,10000000); }, 'git_pull_merge_conflict': function(err) { refresh(true); closeRemoteBox(); }, 'git_connection_failed': function(err) { - RED.notify("Could not connect to remote repository: "+err.toString(),"warning") + RED.notify(RED._("sidebar.project.versionControl.connectionFailed")+err.toString(),"warning") }, 'git_pull_unrelated_history': function(error) { - var notification = RED.notify("

The remote has an unrelated history of commits.

Are you sure you want to pull the changes into your local repository?

",{ + var notification = RED.notify(RED._("sidebar.project.versionControl.pullUnrelatedHistory"),{ type: 'error', modal: true, fixed: true, @@ -967,7 +970,7 @@ RED.sidebar.versionControl = (function() { notification.close(); } },{ - text: 'Pull changes', + text: RED._("sidebar.project.versionControl.pullChanges"), click: function() { notification.close(); options.allowUnrelatedHistories = true; @@ -986,7 +989,7 @@ RED.sidebar.versionControl = (function() { spinner.remove(); }); } - $('') + $('') .appendTo(row) .click(function(e) { e.preventDefault(); @@ -999,7 +1002,7 @@ RED.sidebar.versionControl = (function() { RED.sidebar.addTab({ id: "version-control", - label: "history", + label: RED._("sidebar.project.versionControl.history"), name: "Project History", content: sidebarContent, enableOnEdit: false, @@ -1021,17 +1024,17 @@ RED.sidebar.versionControl = (function() { if (daysDelta > 30) { return (new Date(date*1000)).toLocaleDateString(); } else if (daysDelta > 0) { - return daysDelta+" day"+(daysDelta>1?"s":"")+" ago"; + return RED._("sidebar.project.versionControl.daysAgo", {count:daysDelta}) } var hoursDelta = Math.floor(delta / (60*60)); if (hoursDelta > 0) { - return hoursDelta+" hour"+(hoursDelta>1?"s":"")+" ago"; + return RED._("sidebar.project.versionControl.hoursAgo", {count:hoursDelta}) } var minutesDelta = Math.floor(delta / 60); if (minutesDelta > 0) { - return minutesDelta+" minute"+(minutesDelta>1?"s":"")+" ago"; + return RED._("sidebar.project.versionControl.minsAgo", {count:minutesDelta}) } - return "Seconds ago"; + return RED._("sidebar.project.versionControl.secondsAgo"); } function updateBulk(files,unstaged) { @@ -1066,9 +1069,6 @@ RED.sidebar.versionControl = (function() { var refreshInProgress = false; - var emptyStagedItem = { label:"None" }; - var emptyMergedItem = { label:"All conflicts resolved. Commit the changes to complete the merge." }; - function getCommits(url,targetList,spinnerTarget,limit,before) { var spinner = utils.addSpinnerOverlay(spinnerTarget); var fullUrl = url+"?limit="+(limit||20); @@ -1276,7 +1276,7 @@ RED.sidebar.versionControl = (function() { refreshFiles(result); $('#sidebar-version-control-local-branch').text(result.branches.local); - $('#sidebar-version-control-remote-branch').text(result.branches.remote||"none"); + $('#sidebar-version-control-remote-branch').text(result.branches.remote||RED._("sidebar.project.versionControl.none")); var commitsAhead = result.commits.ahead || 0; var commitsBehind = result.commits.behind || 0; @@ -1306,7 +1306,7 @@ RED.sidebar.versionControl = (function() { $('#sidebar-version-control-commits-ahead').text(""); $('#sidebar-version-control-commits-behind').text(""); - $('#sidebar-version-control-repo-toolbar-message').text("Your local branch is not currently tracking a remote branch."); + $('#sidebar-version-control-repo-toolbar-message').text(RED._("sidebar.project.versionControl.notTracking")); $("#sidebar-version-control-repo-pull").attr('disabled',true); $("#sidebar-version-control-repo-push").attr('disabled',true); } @@ -1332,23 +1332,26 @@ RED.sidebar.versionControl = (function() { $('#sidebar-version-control-commits-ahead').text(commitsAhead); $('#sidebar-version-control-commits-behind').text(commitsBehind); if (isMerging) { - $('#sidebar-version-control-repo-toolbar-message').text("Your repository has unmerged changes. You need to fix the conflicts and commit the result."); + $('#sidebar-version-control-repo-toolbar-message').text(RED._("sidebar.project.versionControl.statusUnmergedChanged")); $("#sidebar-version-control-repo-pull").attr('disabled',true); $("#sidebar-version-control-repo-push").attr('disabled',true); } else if (commitsAhead > 0 && commitsBehind === 0) { - $('#sidebar-version-control-repo-toolbar-message').text("Your repository is "+commitsAhead+" commit"+(commitsAhead===1?'':'s')+" ahead of the remote. You can push "+(commitsAhead===1?'this commit':'these commits')+" now."); + $('#sidebar-version-control-repo-toolbar-message').text(RED._("sidebar.project.versionControl.commitsAhead", {count:commitsAhead})); $("#sidebar-version-control-repo-pull").attr('disabled',true); $("#sidebar-version-control-repo-push").attr('disabled',false); } else if (commitsAhead === 0 && commitsBehind > 0) { - $('#sidebar-version-control-repo-toolbar-message').text("Your repository is "+commitsBehind+" commit"+(commitsBehind===1?'':'s')+" behind of the remote. You can pull "+(commitsBehind===1?'this commit':'these commits')+" now."); + $('#sidebar-version-control-repo-toolbar-message').text(RED._("sidebar.project.versionControl.commitsBehind",{ count: commitsBehind })); $("#sidebar-version-control-repo-pull").attr('disabled',false); $("#sidebar-version-control-repo-push").attr('disabled',true); } else if (commitsAhead > 0 && commitsBehind > 0) { - $('#sidebar-version-control-repo-toolbar-message').text("Your repository is "+commitsBehind+" commit"+(commitsBehind===1?'':'s')+" behind and "+commitsAhead+" commit"+(commitsAhead===1?'':'s')+" ahead of the remote. You must pull the remote commit"+(commitsBehind===1?'':'s')+" down before pushing."); + $('#sidebar-version-control-repo-toolbar-message').text( + RED._("sidebar.project.versionControl.commitsAheadAndBehind1",{ count:commitsBehind })+ + RED._("sidebar.project.versionControl.commitsAheadAndBehind2",{ count:commitsAhead })+ + RED._("sidebar.project.versionControl.commitsAheadAndBehind3",{ count:commitsBehind })); $("#sidebar-version-control-repo-pull").attr('disabled',false); $("#sidebar-version-control-repo-push").attr('disabled',true); } else if (commitsAhead === 0 && commitsBehind === 0) { - $('#sidebar-version-control-repo-toolbar-message').text("Your repository is up to date."); + $('#sidebar-version-control-repo-toolbar-message').text(RED._("sidebar.project.versionControl.repositoryUpToDate")); $("#sidebar-version-control-repo-pull").attr('disabled',true); $("#sidebar-version-control-repo-push").attr('disabled',true); } diff --git a/red/api/editor/locales/en-US/editor.json b/red/api/editor/locales/en-US/editor.json index dfcef21a6..01905db93 100644 --- a/red/api/editor/locales/en-US/editor.json +++ b/red/api/editor/locales/en-US/editor.json @@ -457,7 +457,74 @@ "delete": "Delete key", "git-config": "Git config", "deleteConfirm": "Are you sure you want to delete the SSH key __name__? This cannot be undone." - } + }, + "versionControl": { + "unstagedChanges": "Unstaged changes", + "stagedChanges": "Staged changes", + "resolveConflicts": "Resolve conflicts", + "head": "HEAD", + "staged": "Staged", + "unstaged": "Unstaged", + "local": "Local", + "remote": "Remote", + "revert": "Are you sure you want to revert the changes to '__file__'? This cannot be undone.", + "revertChanges": "Revert changes", + "localChanges": "Local Changes", + "none": "None", + "conflictResolve": "All conflicts resolved. Commit the changes to complete the merge.", + "localFiles": "Local files", + "all": "all", + "unmergedChanges": "Unmerged changes", + "abortMerge": "abort merge", + "commit": "commit", + "changeToCommit": "Changes to commit", + "commitPlaceholder": "Enter your commit message", + "cancelCapital": "Cancel", + "commitCapital": "Commit", + "commitHistory": "Commit History", + "branch": "Branch:", + "moreCommits": " more commit(s)", + "changeLocalBranch": "Change local branch", + "createBranchPlaceholder": "Find or create a branch", + "upstream": "upstream", + "localOverwrite": "You have local changes that would be overwritten by changing the branch. You must either commit or undo those changes first.", + "manageRemoteBranch": "Manage remote branch", + "unableToAccess": "Unable to access remote repository", + "retry": "Retry", + "setUpstreamBranch": "Set as upstream branch", + "createRemoteBranchPlaceholder": "Find or create a remote branch", + "trackedUpstreamBranch": "The created branch will be set as the tracked upstream branch.", + "selectUpstreamBranch": "The branch will be created. Select below to set it as the tracked upstream branch.", + "pushFailed": "Push failed as the remote has more recent commits. Pull and merge first, then push again.", // TODO: better message + "push": "push", + "pull": "pull", + "unablePull": "

Unable to pull remote changes; your unstaged local changes would be overwritten.

Commit your changes and try again.

", + "showUnstagedChanges": "Show unstaged changes", + "connectionFailed": "Could not connect to remote repository: ", + "pullUnrelatedHistory": "

The remote has an unrelated history of commits.

Are you sure you want to pull the changes into your local repository?

", + "pullChanges": "Pull changes", + "history": "history", + "daysAgo": "__count__ day ago", + "daysAgo_plural": "__count__ days ago", + "hoursAgo": "__count__ hour ago", + "hoursAgo_plural": "__count__ hours ago", + "minsAgo": "__count__ min ago", + "minsAgo_plural": "__count__ mins ago", + "secondsAgo": "Seconds ago", + "notTracking": "Your local branch is not currently tracking a remote branch.", + "statusUnmergedChanged": "Your repository has unmerged changes. You need to fix the conflicts and commit the result.", + "repositoryUpToDate": "Your repository is up to date.", + "commitsAhead": "Your repository is __count__ commit ahead of the remote. You can push this commit now.", + "commitsAhead_plural": "Your repository is __count__ commits ahead of the remote. You can push these commits now.", + "commitsBehind": "Your repository is __count__ commit behind of the remote. You can pull this commit now.", + "commitsBehind_plural": "Your repository is __count__ commits behind of the remote. You can pull these commits now.", + "commitsAheadAndBehind1": "Your repository is __count__ commit behind and ", + "commitsAheadAndBehind1_plural": "Your repository is __count__ commits behind and ", + "commitsAheadAndBehind2": "__count__ commit ahead of the remote. ", + "commitsAheadAndBehind2_plural": "__count__ commits ahead of the remote. ", + "commitsAheadAndBehind3": "You must pull the remote commit down before pushing.", + "commitsAheadAndBehind3_plural": "You must pull the remote commits down before pushing." + } } }, "typedInput": { diff --git a/red/api/editor/locales/ja/editor.json b/red/api/editor/locales/ja/editor.json index 999dc3422..58d9fe6bf 100644 --- a/red/api/editor/locales/ja/editor.json +++ b/red/api/editor/locales/ja/editor.json @@ -447,6 +447,74 @@ "delete": "キーを削除", "git-config": "Git設定", "deleteConfirm": "SSHキー __name__ を削除してもよいですか？ 削除したSSHキーを元に戻すことはできません。" + }, + "versionControl": { + "unstagedChanges": "ステージングされていない変更", + "stagedChanges": "ステージングされた変更", + "resolveConflicts": "コンフリクトの解決", + "head": "最新", + "staged": "ステージング", + "unstaged": "未ステージング", + "local": "ローカル", + "remote": "リモート", + "revert": "'__file__'への変更を本当に戻しますか？この操作は元に戻せません。", + "revertChanges": "変更を戻す", + "localChanges": "ローカルの変更", + "none": "なし", + "conflictResolve": "全てのコンフリクトが解消されました。マージを完了するため、変更をコミットしてください。", + "localFiles": "ローカルファイル", + "all": "全て", + "unmergedChanges": "マージされていない変更", + "abortMerge": "マージ中止", + "commit": "コミット", + "changeToCommit": "コミット対象とする変更", + "commitPlaceholder": "コミットメッセージを入力してください。", + "cancelCapital": "キャンセル", + "commitCapital": "コミット", + "commitHistory": "コミット履歴", + "branch": "ブランチ:", + "moreCommits": "個のコミット", + "changeLocalBranch": "ローカルブランチの変更", + "createBranchPlaceholder": "ブランチの検索または作成", + "upstream": "アップストリーム", + "localOverwrite": "ブランチの変更によって上書きされたローカルの変更があります。これらの変更を先にコミットするか、あるいは元に戻さなければなりません。", + "manageRemoteBranch": "リモートブランチの管理", + "unableToAccess": "リモートのリポジトリにアクセスできません。", + "retry": "リトライ", + "setUpstreamBranch": "アップストリームとして設定する", + "createRemoteBranchPlaceholder": "リモートブランチの検索または作成", + "trackedUpstreamBranch": "作成されたブランチは、トラッキングされたアップストリームブランチとなります。", + "selectUpstreamBranch": "ブランチが作成されました。トラッキングするアップストリームブランチを選択してください。", + "pushFailed": "リモートに新しいコミットがあるため、プッシュに失敗しました。プルしてマージしてから、再度プッシュしてください。", + "push": "プッシュ", + "pull": "プル", + "unablePull": "

リモートの変更のプル失敗：ステージングされていないローカルの変更を上書きされてしまいます。

変更をコミットしてから再度実行してください。

", + "showUnstagedChanges": "ステージングされていない変更を表示", + "connectionFailed": "リモートリポジトリに接続できません: ", + "pullUnrelatedHistory": "

リモートに関連のないコミット履歴があります。

本当に変更をプルしてローカルリポジトリに反映しますか？

", + "pullChanges": "プル変更", + "history": "履歴", + "plural": "", + "daysAgo": "__count__ 日前", + "daysAgo_plural": "__count__ 日前", + "hoursAgo": "__count__ 時間前", + "hoursAgo_plural": "__count__ 時間前", + "minsAgo": "__count__ 分前", + "minsAgo_plural": "__count__ 分前", + "secondsAgo": "数秒前", + "notTracking": "ローカルブランチは現在リモートブランチをトラッキングしていません。", + "statusUnmergedChanged": "リポジトリ内にマージされていない変更があります。コンフリクトを解決してコミットしてください。", + "repositoryUpToDate": "リポジトリは最新です。", + "commitsAhead": "あなたのリポジトリはリモートより__count__コミット進んでいます。現在のコミットをプッシュできます。", + "commitsAhead_plural": "あなたのリポジトリはリモートより__count__コミット進んでいます。現在のコミットをプッシュできます。", + "commitsBehind": "あなたのリポジトリはリモートより__count__コミット遅れています。現在のコミットをプルできます。", + "commitsBehind_plural": "あなたのリポジトリはリモートより__count__コミット遅れています。現在のコミットをプルできます。", + "commitsAheadAndBehind1": "あなたのリポジトリはリモートより__count__コミット遅れており、かつ", + "commitsAheadAndBehind1_plural": "あなたのリポジトリはリモートより__count__コミット遅れており、かつ", + "commitsAheadAndBehind2": "__count__コミット進んでいます。 ", + "commitsAheadAndBehind2_plural": "__count__コミット進んでいます。 ", + "commitsAheadAndBehind3": "プッシュする前にリモートのコミットをプルしてください。", + "commitsAheadAndBehind3_plural": "プッシュする前にリモートのコミットをプルしてください。" } } }, From b0c693cc3ad0bdb6f90cf018eee260f947818210 Mon Sep 17 00:00:00 2001 From: Kazuki-Nakanishi Date: Mon, 28 May 2018 17:06:38 +0900 Subject: [PATCH 24/34] move comment from json to js --- editor/js/ui/projects/tab-versionControl.js | 1 + red/api/editor/locales/en-US/editor.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/editor/js/ui/projects/tab-versionControl.js b/editor/js/ui/projects/tab-versionControl.js index c5db3f251..ee8cb98f4 100644 --- a/editor/js/ui/projects/tab-versionControl.js +++ b/editor/js/ui/projects/tab-versionControl.js @@ -897,6 +897,7 @@ RED.sidebar.versionControl = (function() { }, 400: { 'git_push_failed': function(err) { + // TODO: better message RED.notify(RED._("sidebar.project.versionControl.pushFailed"),"error"); }, 'unexpected_error': function(error) { diff --git a/red/api/editor/locales/en-US/editor.json b/red/api/editor/locales/en-US/editor.json index 01905db93..34e527c19 100644 --- a/red/api/editor/locales/en-US/editor.json +++ b/red/api/editor/locales/en-US/editor.json @@ -495,7 +495,7 @@ "createRemoteBranchPlaceholder": "Find or create a remote branch", "trackedUpstreamBranch": "The created branch will be set as the tracked upstream branch.", "selectUpstreamBranch": "The branch will be created. Select below to set it as the tracked upstream branch.", - "pushFailed": "Push failed as the remote has more recent commits. Pull and merge first, then push again.", // TODO: better message + "pushFailed": "Push failed as the remote has more recent commits. Pull and merge first, then push again.", "push": "push", "pull": "pull", "unablePull": "

Unable to pull remote changes; your unstaged local changes would be overwritten.

Commit your changes and try again.

", From 4f7d98aacee4cbd32f326ee1a3dee4655530399f Mon Sep 17 00:00:00 2001 From: Yuma Matsuura Date: Mon, 28 May 2018 17:03:33 +0900 Subject: [PATCH 25/34] modify translate user settings --- editor/js/ui/projects/projectUserSettings.js | 16 ++++++++-------- red/api/editor/locales/en-US/editor.json | 16 ++++++++-------- red/api/editor/locales/ja/editor.json | 16 ++++++++-------- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/editor/js/ui/projects/projectUserSettings.js b/editor/js/ui/projects/projectUserSettings.js index a343a07cc..c13bd476f 100644 --- a/editor/js/ui/projects/projectUserSettings.js +++ b/editor/js/ui/projects/projectUserSettings.js @@ -27,7 +27,7 @@ RED.projects.userSettings = (function() { var title = $('

').text(RED._("editor:sidebar.project.userSettings.committerDetail")).appendTo(pane); var gitconfigContainer = $('').appendTo(pane); - $('
').appendTo(gitconfigContainer).text(RED._("editor:sidebar.project.userSettings.committer-tip")); + $('
').appendTo(gitconfigContainer).text(RED._("editor:sidebar.project.userSettings.committerTip")); var row = $('').appendTo(gitconfigContainer); $('').text(RED._("editor:sidebar.project.userSettings.userName")).appendTo(row); @@ -45,7 +45,7 @@ RED.projects.userSettings = (function() { var container = $('').appendTo(pane); var popover; var title = $('

').text(RED._("editor:sidebar.project.userSettings.sshKeys")).appendTo(container); - var subtitle = $('
').appendTo(container).text(RED._("editor:sidebar.project.userSettings.sshKeys-tip")); + var subtitle = $('
').appendTo(container).text(RED._("editor:sidebar.project.userSettings.sshKeysTip")); var addKeyButton = $('') .appendTo(subtitle) @@ -72,7 +72,7 @@ RED.projects.userSettings = (function() { var validPassphrase = passphrase.length === 0 || passphrase.length >= 8; passphraseInput.toggleClass('input-error',!validPassphrase); if (!validPassphrase) { - passphraseInputSubLabel.text(RED._("editor:sidebar.project.userSettings.passphrase-short")); + passphraseInputSubLabel.text(RED._("editor:sidebar.project.userSettings.passphraseShort")); } else if (passphrase.length === 0) { passphraseInputSubLabel.text(RED._("editor:sidebar.project.userSettings.optional")); } else { @@ -91,11 +91,11 @@ RED.projects.userSettings = (function() { var row = $('').appendTo(container); var addKeyDialog = $('
').hide().appendTo(row); - $('
').text(RED._("editor:sidebar.project.userSettings.add-sshKey")).appendTo(addKeyDialog); + $('
').text(RED._("editor:sidebar.project.userSettings.addSshKey")).appendTo(addKeyDialog); var addKeyDialogBody = $('
').appendTo(addKeyDialog); row = $('').appendTo(addKeyDialogBody); - $('
').appendTo(row).text(RED._("editor:sidebar.project.userSettings.add-sshKey-tip")); + $('
').appendTo(row).text(RED._("editor:sidebar.project.userSettings.addSshKeyTip")); // var bg = $('
',{class:"button-group", style:"text-align: center"}).appendTo(row); // var addLocalButton = $('').appendTo(bg); // var uploadButton = $('').appendTo(bg); @@ -264,7 +264,7 @@ RED.projects.userSettings = (function() { utils.sendRequest(options); var formButtons = $('').appendTo(row); - $('') + $('') .appendTo(formButtons) .click(function(evt) { try { @@ -289,7 +289,7 @@ RED.projects.userSettings = (function() { var container = $('
').appendTo(row); if (entry.empty) { container.addClass('red-ui-search-empty'); - container.text(RED._("editor:sidebar.project.userSettings.no-sshKeys")); + container.text(RED._("editor:sidebar.project.userSettings.noSshKeys")); return; } var topRow = $('
').appendTo(container); @@ -400,7 +400,7 @@ RED.projects.userSettings = (function() { utils = _utils; RED.userSettings.add({ id:'gitconfig', - title: RED._("editor:sidebar.project.userSettings.git-config"), // TODO: nls + title: RED._("editor:sidebar.project.userSettings.gitConfig"), get: createSettingsPane, close: function() { var currentGitSettings = RED.settings.get('git') || {}; diff --git a/red/api/editor/locales/en-US/editor.json b/red/api/editor/locales/en-US/editor.json index dfcef21a6..165a29088 100644 --- a/red/api/editor/locales/en-US/editor.json +++ b/red/api/editor/locales/en-US/editor.json @@ -437,25 +437,25 @@ "editDependencies": "Edit project dependencies", "userSettings": { "committerDetail": "Committer Details", - "committer-tip": "Leave blank to use system default", + "committerTip": "Leave blank to use system default", "userName": "Username", "email": "Email", "sshKeys": "SSH Keys", - "sshKeys-tip": "Allows you to create secure connections to remote git repositories.", + "sshKeysTip": "Allows you to create secure connections to remote git repositories.", "add": "add key", - "add-sshKey": "Add SSH Key", - "add-sshKey-tip": "Generate a new public/private key pair", + "addSshKey": "Add SSH Key", + "addSshKeyTip": "Generate a new public/private key pair", "name": "Name", "nameRule": "Must contain only A-Z 0-9 _ -", "passphrase": "Passphrase", - "passphrase-short": "Passphrase too short", + "passphraseShort": "Passphrase too short", "optional": "Optional", "cancel": "Cancel", "generate": "Generate key", - "no-sshKeys": "No SSH keys", - "copy-publicKey": "Copy public key to clipboard", + "noSshKeys": "No SSH keys", + "copyPublicKey": "Copy public key to clipboard", "delete": "Delete key", - "git-config": "Git config", + "gitConfig": "Git config", "deleteConfirm": "Are you sure you want to delete the SSH key __name__? This cannot be undone." } } diff --git a/red/api/editor/locales/ja/editor.json b/red/api/editor/locales/ja/editor.json index 999dc3422..3ed45e9e7 100644 --- a/red/api/editor/locales/ja/editor.json +++ b/red/api/editor/locales/ja/editor.json @@ -427,25 +427,25 @@ "editDependencies": "プロジェクトの依存関係を編集", "userSettings": { "committerDetail": "コミッター詳細", - "committer-tip": "システムのデフォルトを使用する場合、空白のままにしてください", + "committerTip": "システムのデフォルトを使用する場合、空白のままにしてください", "userName": "ユーザ名", "email": "メールアドレス", "sshKeys": "SSH キー", - "sshKeys-tip": "gitリポジトリへのセキュアな接続を作成できます。", + "sshKeysTip": "gitリポジトリへのセキュアな接続を作成できます。", "add": "キーを追加", - "add-sshKey": "SSHキーを追加", - "add-sshKey-tip": "新しい公開鍵/秘密鍵ペアを生成します", + "addSshKey": "SSHキーを追加", + "addSshKeyTip": "新しい公開鍵/秘密鍵ペアを生成します", "name": "名前", "nameRule": "A-Z 0-9 _ - のみを含む", "passphrase": "パスフレーズ", - "passphrase-short": "パスフレーズが短すぎます", + "passphraseShort": "パスフレーズが短すぎます", "optional": "任意", "cancel": "中止", "generate": "キーを生成", - "no-sshKeys": "SSHキーがありません", - "copy-publicKey": "公開鍵をクリップボードにコピー", + "noSshKeys": "SSHキーがありません", + "copyPublicKey": "公開鍵をクリップボードにコピー", "delete": "キーを削除", - "git-config": "Git設定", + "gitConfig": "Git設定", "deleteConfirm": "SSHキー __name__ を削除してもよいですか？ 削除したSSHキーを元に戻すことはできません。" } } From de43148341f5c381a9a1409c4a1c2dbbb0c5f080 Mon Sep 17 00:00:00 2001 From: Hiroyasu Nishiyama Date: Wed, 30 May 2018 20:32:56 +0900 Subject: [PATCH 26/34] change current_locale to getCurrentLocale --- red/runtime/i18n.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/red/runtime/i18n.js b/red/runtime/i18n.js index 336a2c9a6..b34564f47 100644 --- a/red/runtime/i18n.js +++ b/red/runtime/i18n.js @@ -81,7 +81,7 @@ var MessageFileLoader = { } -function current_locale() { +function getCurrentLocale() { var env = process.env; for (var name of ['LC_ALL', 'LC_MESSAGES', 'LANG']) { if (name in env) { @@ -102,7 +102,7 @@ function init() { }, fallbackLng: [defaultLang] }; - var lang = current_locale(); + var lang = getCurrentLocale(); if (lang) { opt.lng = lang; } From 0a0ca380d3773862ec64dbd44bafd852bb50c60c Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Wed, 30 May 2018 13:32:38 +0100 Subject: [PATCH 27/34] Ensure apiMaxLength applies to HTTP Nodes Fixes #1278 --- nodes/core/io/21-httpin.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nodes/core/io/21-httpin.js b/nodes/core/io/21-httpin.js index d71a7fa29..43e25b56f 100644 --- a/nodes/core/io/21-httpin.js +++ b/nodes/core/io/21-httpin.js @@ -21,8 +21,6 @@ module.exports = function(RED) { var cookieParser = require("cookie-parser"); var getBody = require('raw-body'); var cors = require('cors'); - var jsonParser = bodyParser.json(); - var urlencParser = bodyParser.urlencoded({extended:true}); var onHeaders = require('on-headers'); var typer = require('media-typer'); var isUtf8 = require('is-utf8'); @@ -212,6 +210,10 @@ module.exports = function(RED) { } } + var maxApiRequestSize = RED.settings.apiMaxLength || '5mb'; + var jsonParser = bodyParser.json({limit:maxApiRequestSize}); + var urlencParser = bodyParser.urlencoded({limit:maxApiRequestSize,extended:true}); + var metricsHandler = function(req,res,next) { next(); } if (this.metric()) { metricsHandler = function(req, res, next) { From 5a70bea67ad7b40ce349e4179f4a578b1228a6fe Mon Sep 17 00:00:00 2001 From: Yuma Matsuura Date: Mon, 28 May 2018 16:00:32 +0900 Subject: [PATCH 28/34] add translate project diff --- editor/js/ui/diff.js | 12 ++++++------ red/api/editor/locales/en-US/editor.json | 8 ++++++-- red/api/editor/locales/ja/editor.json | 7 ++++++- 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/editor/js/ui/diff.js b/editor/js/ui/diff.js index 4a305eb6c..97a92178b 100644 --- a/editor/js/ui/diff.js +++ b/editor/js/ui/diff.js @@ -1233,7 +1233,7 @@ RED.diff = (function() { // currentDiff = diff; var trayOptions = { - title: options.title||"Review Changes", //TODO: nls + title: options.title||RED._("diff.reviewChanges"), width: Infinity, overlay: true, buttons: [ @@ -1416,7 +1416,7 @@ RED.diff = (function() { function showTextDiff(textA,textB) { var trayOptions = { - title: "Compare Changes", //TODO: nls + title: RED._("diff.compareChanges"), width: Infinity, overlay: true, buttons: [ @@ -1797,7 +1797,7 @@ RED.diff = (function() { if (isBinary) { var diffBinaryRow = $('').appendTo(codeBody); var binaryContent = $('').appendTo(diffBinaryRow); - $('').text("Cannot show binary file contents").appendTo(binaryContent); + $('').text(RED._("diff.noBinaryFileShowed")).appendTo(binaryContent); } else { if (commitOptions.unmerged) { @@ -1946,7 +1946,7 @@ RED.diff = (function() { function showCommitDiff(options) { var commit = parseCommitDiff(options.commit); var trayOptions = { - title: "View Commit Changes", //TODO: nls + title: RED._("diff.viewCommitDiff"), width: Infinity, overlay: true, buttons: [ @@ -2008,7 +2008,7 @@ RED.diff = (function() { } var trayOptions = { - title: title||"Compare Changes", //TODO: nls + title: title|| RED._("diff.compareChanges"), width: Infinity, overlay: true, buttons: [ @@ -2041,7 +2041,7 @@ RED.diff = (function() { trayOptions.buttons.push( { id: "node-diff-view-resolve-diff", - text: "Save conflict resolution", + text: RED._("diff.saveConflict"), class: "primary disabled", click: function() { if (!$("#node-diff-view-resolve-diff").hasClass('disabled')) { diff --git a/red/api/editor/locales/en-US/editor.json b/red/api/editor/locales/en-US/editor.json index d827ba092..bcfe55972 100644 --- a/red/api/editor/locales/en-US/editor.json +++ b/red/api/editor/locales/en-US/editor.json @@ -193,8 +193,12 @@ "nodeCount": "__count__ node", "nodeCount_plural": "__count__ nodes", "local":"Local changes", - "remote":"Remote changes" - + "remote":"Remote changes", + "reviewChanges": "Review Changes", + "noBinaryFileShowed": "Cannot show binary file contents", + "viewCommitDiff": "View Commit Changes", + "compareChanges": "Compare Changes", + "saveConflict": "Save conflict resolution" }, "subflow": { "editSubflow": "Edit flow template: __name__", diff --git a/red/api/editor/locales/ja/editor.json b/red/api/editor/locales/ja/editor.json index 68e4fc517..8d3c958ff 100644 --- a/red/api/editor/locales/ja/editor.json +++ b/red/api/editor/locales/ja/editor.json @@ -188,7 +188,12 @@ "nodeCount": "__count__ 個のノード", "nodeCount_plural": "__count__ 個のノード", "local": "ローカルの変更", - "remote": "リモートの変更" + "remote": "リモートの変更", + "reviewChanges": "変更を表示", + "noBinaryFileShowed": "バイナリファイルの中身は表示することができません", + "viewCommitDiff": "コミットの内容を表示", + "compareChanges": "変更を比較", + "saveConflict": "解決して保存" }, "subflow": { "editSubflow": "フローのテンプレートを編集: __name__", From 9e87a605976027bb6f3cdfe9dc5f7371a6bfe22e Mon Sep 17 00:00:00 2001 From: Yuma Matsuura Date: Wed, 30 May 2018 17:07:45 +0900 Subject: [PATCH 29/34] modify translate project diff --- editor/js/ui/diff.js | 10 +++++----- red/api/editor/locales/en-US/editor.json | 6 +++++- red/api/editor/locales/ja/editor.json | 6 +++++- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/editor/js/ui/diff.js b/editor/js/ui/diff.js index 97a92178b..eb822df1e 100644 --- a/editor/js/ui/diff.js +++ b/editor/js/ui/diff.js @@ -1747,7 +1747,7 @@ RED.diff = (function() { try { commonFlow = JSON.parse(commonVersion.content||"[]"); } catch(err) { - console.log("Common Version doesn't contain valid JSON:",commonVersionUrl); + console.log(RED._("diff.commonVersionError"),commonVersionUrl); console.log(err); return; } @@ -1755,7 +1755,7 @@ RED.diff = (function() { try { oldFlow = JSON.parse(oldVersion.content||"[]"); } catch(err) { - console.log("Old Version doesn't contain valid JSON:",oldVersionUrl); + console.log(RED._("diff.oldVersionError"),oldVersionUrl); console.log(err); return; } @@ -1765,7 +1765,7 @@ RED.diff = (function() { try { newFlow = JSON.parse(newVersion.content||"[]"); } catch(err) { - console.log("New Version doesn't contain valid JSON:",newFlow); + console.log(RED._("diff.newVersionError"),newFlow); console.log(err); return; } @@ -1801,7 +1801,7 @@ RED.diff = (function() { } else { if (commitOptions.unmerged) { - conflictHeader = $(''+resolvedConflicts+' of '+unresolvedConflicts+' conflicts resolved').appendTo(content); + conflictHeader = $(''+RED._("diff.conflictHeader",{resolved:resolvedConflicts, unresolved:unresolvedConflicts})+'').appendTo(content); } hunks.forEach(function(hunk) { var diffRow = $('').appendTo(codeBody); @@ -1914,7 +1914,7 @@ RED.diff = (function() { diffRow.remove(); addedRows.find(".linetext").addClass('added'); conflictHeader.empty(); - $(''+resolvedConflicts+' of '+unresolvedConflicts+' conflicts resolved').appendTo(conflictHeader); + $(''+RED._("diff.conflictHeader",{resolved:resolvedConflicts, unresolved:unresolvedConflicts})+'').appendTo(conflictHeader); conflictResolutions[file.file] = conflictResolutions[file.file] || {}; conflictResolutions[file.file][hunk.localChangeStart] = { diff --git a/red/api/editor/locales/en-US/editor.json b/red/api/editor/locales/en-US/editor.json index bcfe55972..96af46b9c 100644 --- a/red/api/editor/locales/en-US/editor.json +++ b/red/api/editor/locales/en-US/editor.json @@ -198,7 +198,11 @@ "noBinaryFileShowed": "Cannot show binary file contents", "viewCommitDiff": "View Commit Changes", "compareChanges": "Compare Changes", - "saveConflict": "Save conflict resolution" + "saveConflict": "Save conflict resolution", + "conflictHeader": "__resolved__ of __unresolved__ conflicts resolved", + "commonVersionError": "Common Version doesn't contain valid JSON:", + "oldVersionError": "Old Version doesn't contain valid JSON:", + "newVersionError": "New Version doesn't contain valid JSON:" }, "subflow": { "editSubflow": "Edit flow template: __name__", diff --git a/red/api/editor/locales/ja/editor.json b/red/api/editor/locales/ja/editor.json index 8d3c958ff..17dcefb1e 100644 --- a/red/api/editor/locales/ja/editor.json +++ b/red/api/editor/locales/ja/editor.json @@ -193,7 +193,11 @@ "noBinaryFileShowed": "バイナリファイルの中身は表示することができません", "viewCommitDiff": "コミットの内容を表示", "compareChanges": "変更を比較", - "saveConflict": "解決して保存" + "saveConflict": "解決して保存", + "conflictHeader": "__unresolved__ 個中 __resolved__ 個のコンフリクトを解決", + "commonVersionError": "共通バージョンは正しいJSON形式ではありません:", + "oldVersionError": "古いバージョンは正しいJSON形式ではありません:", + "newVersionError": "新しいバージョンは正しいJSON形式ではありません:" }, "subflow": { "editSubflow": "フローのテンプレートを編集: __name__", From ab788bc1e3b9decc6e55979b3b6d7e5e1d82468a Mon Sep 17 00:00:00 2001 From: Kazuhito Yokoi Date: Fri, 1 Jun 2018 12:58:09 +0900 Subject: [PATCH 30/34] Add i18n support for projectSettings.js --- editor/js/ui/projects/projectSettings.js | 112 +++++++++++++---------- red/api/editor/locales/en-US/editor.json | 39 ++++++++ red/api/editor/locales/ja/editor.json | 38 ++++++++ 3 files changed, 140 insertions(+), 49 deletions(-) diff --git a/editor/js/ui/projects/projectSettings.js b/editor/js/ui/projects/projectSettings.js index 91dbb57ff..b5ee024a1 100644 --- a/editor/js/ui/projects/projectSettings.js +++ b/editor/js/ui/projects/projectSettings.js @@ -49,7 +49,7 @@ RED.projects.settings = (function() { var tabContainer; var trayOptions = { - title: "Project Settings",// RED._("menu.label.userSettings"),, // TODO: nls + title: RED._("menu.label.userSettings"), buttons: [ { id: "node-dialog-ok", @@ -173,14 +173,14 @@ RED.projects.settings = (function() { container.empty(); var bg = $('').appendTo(container); var input = $('').val(summary||"").appendTo(container); - $('') + $('') .appendTo(bg) .click(function(evt) { evt.preventDefault(); updateProjectSummary(activeProject.summary, container); editButton.show(); }); - $('') + $('') .appendTo(bg) .click(function(evt) { evt.preventDefault(); @@ -223,7 +223,7 @@ RED.projects.settings = (function() { if (summary) { container.text(summary).removeClass('node-info-node'); } else { - container.text("No summary available").addClass('node-info-none');// TODO: nls + container.text(RED._("sidebar.project.projectSettings.noSummaryAvailable")).addClass('node-info-none'); } } @@ -235,7 +235,8 @@ RED.projects.settings = (function() { var summaryContent = $('
',{style:"color: #999"}).appendTo(summary); updateProjectSummary(activeProject.summary, summaryContent); if (RED.user.hasPermission("projects.write")) { - $('') + $('') .prependTo(summary) .click(function(evt) { evt.preventDefault(); @@ -250,7 +251,8 @@ RED.projects.settings = (function() { updateProjectDescription(activeProject, descriptionContent); if (RED.user.hasPermission("projects.write")) { - $('') + $('') .prependTo(description) .click(function(evt) { evt.preventDefault(); @@ -316,7 +318,7 @@ RED.projects.settings = (function() { // depsList.editableList('addItem',{index:3, label:"Unused dependencies"}); // TODO: nls // } if (totalCount === 0) { - depsList.editableList('addItem',{index:0, label:"None"}); // TODO: nls + depsList.editableList('addItem',{index:0, label:RED._("sidebar.project.projectSettings.none")}); } } @@ -381,7 +383,8 @@ RED.projects.settings = (function() { function createDependenciesPane(activeProject) { var pane = $('
'); if (RED.user.hasPermission("projects.write")) { - $('') + $('') .appendTo(pane) .click(function(evt) { evt.preventDefault(); @@ -451,7 +454,8 @@ RED.projects.settings = (function() { var buttons = $('
').appendTo(metaRow); if (RED.user.hasPermission("projects.write")) { if (!entry.installed && RED.settings.theme('palette.editable') !== false) { - $('install').appendTo(buttons) + $('' + + RED._("sidebar.project.projectSettings.install") + '').appendTo(buttons) .click(function(evt) { evt.preventDefault(); RED.palette.editor.install(entry,row,function(err) { @@ -468,7 +472,8 @@ RED.projects.settings = (function() { }); }) } else if (entry.known && entry.count === 0) { - $('remove from project').appendTo(buttons) + $('' + + RED._("sidebar.project.projectSettings.removeFromProject") + '').appendTo(buttons) .click(function(evt) { evt.preventDefault(); var deps = $.extend(true, {}, activeProject.dependencies); @@ -484,7 +489,8 @@ RED.projects.settings = (function() { }); }); } else if (!entry.known) { - $('add to project').appendTo(buttons) + $('' + + RED._("sidebar.project.projectSettings.addToProject") + '').appendTo(buttons) .click(function(evt) { evt.preventDefault(); var deps = $.extend(true, {}, activeProject.dependencies); @@ -723,10 +729,11 @@ RED.projects.settings = (function() { // } function createFilesSection(activeProject,pane) { - var title = $('

').text("Files").appendTo(pane); + var title = $('

').text(RED._("sidebar.project.projectSettings.files")).appendTo(pane); var filesContainer = $('').appendTo(pane); if (RED.user.hasPermission("projects.write")) { - var editFilesButton = $('') + var editFilesButton = $('') .appendTo(title) .click(function(evt) { evt.preventDefault(); @@ -750,7 +757,7 @@ RED.projects.settings = (function() { // Flow files row = $('').appendTo(filesContainer); - $('').text('Flow').appendTo(row); + $('').text(RED._("sidebar.project.projectSettings.flow")).appendTo(row); var flowFileLabel = $('
').appendTo(row); var flowFileLabelText = $('').text(activeProject.files.flow).appendTo(flowFileLabel); @@ -787,7 +794,7 @@ RED.projects.settings = (function() { }) row = $('').appendTo(filesContainer); - $('').text('Credentials').appendTo(row); + $('').text(RED._("sidebar.project.projectSettings.credentials")).appendTo(row); var credFileLabel = $('
').text(activeProject.files.credentials).appendTo(row); var credFileInput = $('
').text(activeProject.files.credentials).hide().insertAfter(credFileLabel); @@ -899,12 +906,15 @@ RED.projects.settings = (function() { var credentialFormRows = $('
',{style:"margin-top:10px"}).hide().appendTo(credentialStateLabel); - var credentialSetLabel = $('
Set the encryption key:
').hide().appendTo(credentialFormRows); - var credentialChangeLabel = $('
Change the encryption key:
').hide().appendTo(credentialFormRows); - var credentialResetLabel = $('
Reset the encryption key:
').hide().appendTo(credentialFormRows); + var credentialSetLabel = $('
' + + RED._("sidebar.project.projectSettings.setTheEncryptionKey") + '
').hide().appendTo(credentialFormRows); + var credentialChangeLabel = $('
' + + RED._("sidebar.project.projectSettings.changeTheEncryptionKey") + '
').hide().appendTo(credentialFormRows); + var credentialResetLabel = $('
' + + RED._("sidebar.project.projectSettings.resetTheEncryptionKey") + '
').hide().appendTo(credentialFormRows); var credentialSecretExistingRow = $('').appendTo(credentialFormRows); - $('').text('Current key').appendTo(credentialSecretExistingRow); + $('').text(RED._("sidebar.project.projectSettings.currentKey")).appendTo(credentialSecretExistingRow); var credentialSecretExistingInput = $('').appendTo(credentialSecretExistingRow) .on("change keyup paste",function() { if (popover) { @@ -917,10 +927,11 @@ RED.projects.settings = (function() { var credentialSecretNewRow = $('').appendTo(credentialFormRows); - $('').text('New key').appendTo(credentialSecretNewRow); + $('').text(RED._("sidebar.project.projectSettings.newKey")).appendTo(credentialSecretNewRow); var credentialSecretNewInput = $('').appendTo(credentialSecretNewRow).on("change keyup paste",checkFiles); - var credentialResetWarning = $('
This will delete all existing credentials
').hide().appendTo(credentialFormRows); + var credentialResetWarning = $('
' + + RED._("sidebar.project.projectSettings.credentialsAlert") + '
').hide().appendTo(credentialFormRows); var hideEditForm = function() { @@ -950,13 +961,13 @@ RED.projects.settings = (function() { } var formButtons = $('').hide().appendTo(filesContainer); - $('') + $('') .appendTo(formButtons) .click(function(evt) { evt.preventDefault(); hideEditForm(); }); - var saveButton = $('') + var saveButton = $('') .appendTo(formButtons) .click(function(evt) { evt.preventDefault(); @@ -1032,13 +1043,13 @@ RED.projects.settings = (function() { var updateForm = function() { if (activeProject.settings.credentialSecretInvalid) { credentialStateLabel.find(".user-settings-credentials-state-icon").removeClass().addClass("user-settings-credentials-state-icon fa fa-warning"); - credentialStateLabel.find(".user-settings-credentials-state").text("Invalid encryption key"); + credentialStateLabel.find(".user-settings-credentials-state").text(RED._("sidebar.project.projectSettings.invalidEncryptionKey")); } else if (activeProject.settings.credentialsEncrypted) { credentialStateLabel.find(".user-settings-credentials-state-icon").removeClass().addClass("user-settings-credentials-state-icon fa fa-lock"); - credentialStateLabel.find(".user-settings-credentials-state").text("Encryption enabled"); + credentialStateLabel.find(".user-settings-credentials-state").text(RED._("sidebar.project.projectSettings.encryptionEnabled")); } else { credentialStateLabel.find(".user-settings-credentials-state-icon").removeClass().addClass("user-settings-credentials-state-icon fa fa-unlock"); - credentialStateLabel.find(".user-settings-credentials-state").text("Encryption disabled"); + credentialStateLabel.find(".user-settings-credentials-state").text(RED._("sidebar.project.projectSettings.encryptionDisabled")); } credentialSecretResetButton.toggleClass('disabled',!activeProject.settings.credentialSecretInvalid && !activeProject.settings.credentialsEncrypted); credentialSecretResetButton.prop('disabled',!activeProject.settings.credentialSecretInvalid && !activeProject.settings.credentialsEncrypted); @@ -1050,7 +1061,7 @@ RED.projects.settings = (function() { function createLocalBranchListSection(activeProject,pane) { var localBranchContainer = $('').appendTo(pane); - $('

').text("Branches").appendTo(localBranchContainer); + $('

').text(RED._("sidebar.project.projectSettings.branches")).appendTo(localBranchContainer); var row = $('').appendTo(localBranchContainer); @@ -1063,7 +1074,7 @@ RED.projects.settings = (function() { var container = $('
').appendTo(row); if (entry.empty) { container.addClass('red-ui-search-empty'); - container.text("No branches"); + container.text(RED._("sidebar.project.projectSettings.noBranches")); return; } if (entry.current) { @@ -1095,7 +1106,7 @@ RED.projects.settings = (function() { .click(function(e) { e.preventDefault(); var spinner = utils.addSpinnerOverlay(row).addClass('projects-dialog-spinner-contain'); - var notification = RED.notify("Are you sure you want to delete the local branch '"+entry.name+"'? This cannot be undone.", { + var notification = RED.notify(RED._("sidebar.project.projectSettings.deleteConfirm", { name: entry.name }), { type: "warning", modal: true, fixed: true, @@ -1123,7 +1134,7 @@ RED.projects.settings = (function() { }, 400: { 'git_delete_branch_unmerged': function(error) { - notification = RED.notify("The local branch '"+entry.name+"' has unmerged changes that will be lost. Are you sure you want to delete it?", { + notification = RED.notify(RED._("sidebar.project.projectSettings.unmergedConfirm", { name: entry.name }), { type: "warning", modal: true, fixed: true, @@ -1135,7 +1146,7 @@ RED.projects.settings = (function() { notification.close(); } },{ - text: 'Delete unmerged branch', + text: RED._("sidebar.project.projectSettings.deleteUnmergedBranch"), click: function() { options.url += "?force=true"; notification.close(); @@ -1183,14 +1194,15 @@ RED.projects.settings = (function() { } function createRemoteRepositorySection(activeProject,pane) { - $('

').text("Version Control").appendTo(pane); + $('

').text(RED._("sidebar.project.projectSettings.versionControl")).appendTo(pane); createLocalBranchListSection(activeProject,pane); var repoContainer = $('').appendTo(pane); - var title = $('

').text("Git remotes").appendTo(repoContainer); + var title = $('

').text(RED._("sidebar.project.projectSettings.gitRemotes")).appendTo(repoContainer); - var editRepoButton = $('') + var editRepoButton = $('') .appendTo(title) .click(function(evt) { editRepoButton.attr('disabled',true); @@ -1221,7 +1233,7 @@ RED.projects.settings = (function() { var container = $('
').appendTo(row); if (entry.empty) { container.addClass('red-ui-search-empty'); - container.text("No remotes"); + container.text(RED._("sidebar.project.projectSettings.noRemotes")); return; } else { $('').appendTo(container); @@ -1240,7 +1252,7 @@ RED.projects.settings = (function() { .click(function(e) { e.preventDefault(); var spinner = utils.addSpinnerOverlay(row).addClass('projects-dialog-spinner-contain'); - var notification = RED.notify("Are you sure you want to delete the remote '"+entry.name+"'?", { + var notification = RED.notify(RED._("sidebar.project.projectSettings.deleteRemoteConfrim", { name: entry.name }), { type: "warning", modal: true, fixed: true, @@ -1252,7 +1264,7 @@ RED.projects.settings = (function() { notification.close(); } },{ - text: 'Delete remote', + text: RED._("sidebar.project.projectSettings.deleteRemote"), click: function() { notification.close(); @@ -1315,10 +1327,10 @@ RED.projects.settings = (function() { // var validRepo = /^(?:file|git|ssh|https?|[\d\w\.\-_]+@[\w\.]+):(?:\/\/)?[\w\.@:\/~_-]+(?:\.git)?(?:\/?|\#[\d\w\.\-_]+?)$/.test(remoteURLInput.val()); var validRepo = repo.length > 0 && !/\s/.test(repo); if (/^https?:\/\/[^/]+@/i.test(repo)) { - remoteURLLabel.text("Do not include the username/password in the url"); + remoteURLLabel.text(RED._("sidebar.project.projectSettings.urlRule2")); validRepo = false; } else { - remoteURLLabel.text("https://, ssh:// or file://"); + remoteURLLabel.text(RED._("sidebar.project.projectSettings.urlRule")); } saveButton.attr('disabled',(!validName || !validRepo)) remoteNameInput.toggleClass('input-error',remoteNameInputChanged&&!validName); @@ -1332,22 +1344,24 @@ RED.projects.settings = (function() { var remoteNameInputChanged = false; var remoteURLInputChanged = false; - $('
').text('Add remote').appendTo(addRemoteDialog); + $('
').text(RED._('sidebar.project.projectSettings.addRemote2')).appendTo(addRemoteDialog); row = $('').appendTo(addRemoteDialog); - $('').text('Remote name').appendTo(row); + $('').text(RED._("sidebar.project.projectSettings.remoteName")).appendTo(row); var remoteNameInput = $('').appendTo(row).on("change keyup paste",function() { remoteNameInputChanged = true; validateForm(); }); - $('').appendTo(row).find("small"); + $('').appendTo(row).find("small"); row = $('').appendTo(addRemoteDialog); - $('').text('URL').appendTo(row); + $('').text(RED._("sidebar.project.projectSettings.url")).appendTo(row); var remoteURLInput = $('').appendTo(row).on("change keyup paste",function() { remoteURLInputChanged = true; validateForm() }); - var remoteURLLabel = $('').appendTo(row).find("small"); + var remoteURLLabel = $('').appendTo(row).find("small"); var hideEditForm = function() { editRepoButton.attr('disabled',false); @@ -1361,13 +1375,13 @@ RED.projects.settings = (function() { } var formButtons = $('') .appendTo(addRemoteDialog); - $('') + $('') .appendTo(formButtons) .click(function(evt) { evt.preventDefault(); hideEditForm(); }); - var saveButton = $('') + var saveButton = $('') .appendTo(formButtons) .click(function(evt) { evt.preventDefault(); @@ -1484,19 +1498,19 @@ RED.projects.settings = (function() { utils = _utils; addPane({ id:'main', - title: "Project", // TODO: nls + title: RED._("sidebar.project.name"), get: createMainPane, close: function() { } }); addPane({ id:'deps', - title: "Dependencies", // TODO: nls + title: RED._("sidebar.project.dependencies"), get: createDependenciesPane, close: function() { } }); addPane({ id:'settings', - title: "Settings", // TODO: nls + title: RED._("sidebar.project.settings"), get: createSettingsPane, close: function() { if (popover) { diff --git a/red/api/editor/locales/en-US/editor.json b/red/api/editor/locales/en-US/editor.json index b2285f566..af62248da 100644 --- a/red/api/editor/locales/en-US/editor.json +++ b/red/api/editor/locales/en-US/editor.json @@ -467,8 +467,47 @@ "description": "Description", "dependencies": "Dependencies", "settings": "Settings", + "noSummaryAvailable": "No summary available", "editDescription": "Edit project description", "editDependencies": "Edit project dependencies", + "editReadme": "Edit README.md", + "projectSettings": { + "edit": "edit", + "none": "None", + "install": "install", + "removeFromProject": "remove from project", + "addToProject": "add to project", + "none": "None", + "files": "Files", + "flow": "Flow", + "credentials": "Credentials", + "invalidEncryptionKey": "Invalid encryption key", + "encryptionEnabled": "Encryption enabled", + "encryptionDisabled": "Encryption disabled", + "resetTheEncryptionKey": "Reset the encryption key:", + "setTheEncryptionKey": "Set the encryption key:", + "changeTheEncryptionKey": "Change the encryption key:", + "currentKey": "Current key", + "newKey": "New key", + "credentialsAlert": "This will delete all existing credentials", + "versionControl": "Version Control", + "branches": "Branches", + "noBranches": "No branches", + "deleteConfirm": "Are you sure you want to delete the local branch '__name__'? This cannot be undone.", + "unmergedConfirm": "The local branch '__name__' has unmerged changes that will be lost. Are you sure you want to delete it?", + "deleteUnmergedBranch": "Delete unmerged branch", + "gitRemotes": "Git remotes", + "addRemote": "add remote", + "addRemote2": "Add remote", + "remoteName": "Remote name", + "nameRule": "Must contain only A-Z 0-9 _ -", + "url": "URL", + "urlRule": "https://, ssh:// or file://", + "urlRule2": "Do not include the username/password in the URL", + "noRemotes": "No remotes", + "deleteRemoteConfrim": "Are you sure you want to delete the remote '__name__'?", + "deleteRemote": "Delete remote" + }, "userSettings": { "committerDetail": "Committer Details", "committerTip": "Leave blank to use system default", diff --git a/red/api/editor/locales/ja/editor.json b/red/api/editor/locales/ja/editor.json index d24dcc711..d18938123 100644 --- a/red/api/editor/locales/ja/editor.json +++ b/red/api/editor/locales/ja/editor.json @@ -459,8 +459,46 @@ "description": "詳細", "dependencies": "依存関係", "settings": "設定", + "noSummaryAvailable": "サマリが存在しません", "editDescription": "プロジェクトの詳細を編集", "editDependencies": "プロジェクトの依存関係を編集", + "editReadme": "README.mdを編集", + "projectSettings": { + "edit": "編集", + "none": "なし", + "install": "インストール", + "removeFromProject": "プロジェクトから削除", + "addToProject": "プロジェクトへ追加", + "files": "ファイル", + "flow": "フロー", + "credentials": "認証情報", + "invalidEncryptionKey": "不正な暗号化キー", + "encryptionEnabled": "暗号化が有効になっています", + "encryptionDisabled": "暗号化が無効になっています", + "setTheEncryptionKey": "暗号化キーを設定:", + "resetTheEncryptionKey": "暗号化キーを初期化:", + "changeTheEncryptionKey": "暗号化キーを変更:", + "currentKey": "現在のキー", + "newKey": "新規のキー", + "credentialsAlert": "既存の認証情報は全て削除されます", + "versionControl": "バージョン管理", + "branches": "ブランチ", + "noBranches": "ブランチなし", + "deleteConfirm": "本当にローカルブランチ'__name__'を削除しますか？削除すると元に戻すことはできません。", + "unmergedConfirm": "ローカルブランチ'__name__'にはマージされていない変更があります。この変更は削除されます。本当に削除しますか？", + "deleteUnmergedBranch": "マージされていないブランチを削除", + "gitRemotes": "Gitリモート", + "addRemote": "リモートを追加", + "addRemote2": "リモートを追加", + "remoteName": "リモート名", + "nameRule": "A-Z 0-9 _ - のみを含む", + "url": "URL", + "urlRule": "https://、ssh:// または file://", + "urlRule2": "URLにユーザ名、パスワードを含んではいけません", + "noRemotes": "リモートなし", + "deleteRemoteConfrim": "本当にリモート'__name__'を削除しますか？", + "deleteRemote": "リモートを削除" + }, "userSettings": { "committerDetail": "コミッター詳細", "committerTip": "システムのデフォルトを使用する場合、空白のままにしてください", From dc139bcc305bb0cfd687b5a07d70706aa86d6c43 Mon Sep 17 00:00:00 2001 From: Kazuhito Yokoi Date: Mon, 4 Jun 2018 07:15:26 +0900 Subject: [PATCH 31/34] Remove new line --- editor/js/ui/projects/projectSettings.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/editor/js/ui/projects/projectSettings.js b/editor/js/ui/projects/projectSettings.js index b5ee024a1..b7156fcb6 100644 --- a/editor/js/ui/projects/projectSettings.js +++ b/editor/js/ui/projects/projectSettings.js @@ -1360,8 +1360,7 @@ RED.projects.settings = (function() { remoteURLInputChanged = true; validateForm() }); - var remoteURLLabel = $('').appendTo(row).find("small"); + var remoteURLLabel = $('').appendTo(row).find("small"); var hideEditForm = function() { editRepoButton.attr('disabled',false); From 0e4cedbc5e2bcd3568d7f4c8a4edd2153a30450a Mon Sep 17 00:00:00 2001 From: Kazuhito Yokoi Date: Mon, 4 Jun 2018 07:21:48 +0900 Subject: [PATCH 32/34] Remove new lines --- editor/js/ui/projects/projectSettings.js | 39 ++++++++---------------- 1 file changed, 13 insertions(+), 26 deletions(-) diff --git a/editor/js/ui/projects/projectSettings.js b/editor/js/ui/projects/projectSettings.js index b7156fcb6..011c9fbe7 100644 --- a/editor/js/ui/projects/projectSettings.js +++ b/editor/js/ui/projects/projectSettings.js @@ -235,8 +235,7 @@ RED.projects.settings = (function() { var summaryContent = $('
',{style:"color: #999"}).appendTo(summary); updateProjectSummary(activeProject.summary, summaryContent); if (RED.user.hasPermission("projects.write")) { - $('') + $('') .prependTo(summary) .click(function(evt) { evt.preventDefault(); @@ -251,8 +250,7 @@ RED.projects.settings = (function() { updateProjectDescription(activeProject, descriptionContent); if (RED.user.hasPermission("projects.write")) { - $('') + $('') .prependTo(description) .click(function(evt) { evt.preventDefault(); @@ -383,8 +381,7 @@ RED.projects.settings = (function() { function createDependenciesPane(activeProject) { var pane = $('
'); if (RED.user.hasPermission("projects.write")) { - $('') + $('') .appendTo(pane) .click(function(evt) { evt.preventDefault(); @@ -454,8 +451,7 @@ RED.projects.settings = (function() { var buttons = $('
').appendTo(metaRow); if (RED.user.hasPermission("projects.write")) { if (!entry.installed && RED.settings.theme('palette.editable') !== false) { - $('' - + RED._("sidebar.project.projectSettings.install") + '').appendTo(buttons) + $('' + RED._("sidebar.project.projectSettings.install") + '').appendTo(buttons) .click(function(evt) { evt.preventDefault(); RED.palette.editor.install(entry,row,function(err) { @@ -472,8 +468,7 @@ RED.projects.settings = (function() { }); }) } else if (entry.known && entry.count === 0) { - $('' - + RED._("sidebar.project.projectSettings.removeFromProject") + '').appendTo(buttons) + $('' + RED._("sidebar.project.projectSettings.removeFromProject") + '').appendTo(buttons) .click(function(evt) { evt.preventDefault(); var deps = $.extend(true, {}, activeProject.dependencies); @@ -489,8 +484,7 @@ RED.projects.settings = (function() { }); }); } else if (!entry.known) { - $('' - + RED._("sidebar.project.projectSettings.addToProject") + '').appendTo(buttons) + $('' + RED._("sidebar.project.projectSettings.addToProject") + '').appendTo(buttons) .click(function(evt) { evt.preventDefault(); var deps = $.extend(true, {}, activeProject.dependencies); @@ -732,8 +726,7 @@ RED.projects.settings = (function() { var title = $('

').text(RED._("sidebar.project.projectSettings.files")).appendTo(pane); var filesContainer = $('').appendTo(pane); if (RED.user.hasPermission("projects.write")) { - var editFilesButton = $('') + var editFilesButton = $('') .appendTo(title) .click(function(evt) { evt.preventDefault(); @@ -906,12 +899,9 @@ RED.projects.settings = (function() { var credentialFormRows = $('
',{style:"margin-top:10px"}).hide().appendTo(credentialStateLabel); - var credentialSetLabel = $('
' - + RED._("sidebar.project.projectSettings.setTheEncryptionKey") + '
').hide().appendTo(credentialFormRows); - var credentialChangeLabel = $('
' - + RED._("sidebar.project.projectSettings.changeTheEncryptionKey") + '
').hide().appendTo(credentialFormRows); - var credentialResetLabel = $('
' - + RED._("sidebar.project.projectSettings.resetTheEncryptionKey") + '
').hide().appendTo(credentialFormRows); + var credentialSetLabel = $('
' + RED._("sidebar.project.projectSettings.setTheEncryptionKey") + '
').hide().appendTo(credentialFormRows); + var credentialChangeLabel = $('
' + RED._("sidebar.project.projectSettings.changeTheEncryptionKey") + '
').hide().appendTo(credentialFormRows); + var credentialResetLabel = $('
' + RED._("sidebar.project.projectSettings.resetTheEncryptionKey") + '
').hide().appendTo(credentialFormRows); var credentialSecretExistingRow = $('').appendTo(credentialFormRows); $('').text(RED._("sidebar.project.projectSettings.currentKey")).appendTo(credentialSecretExistingRow); @@ -930,8 +920,7 @@ RED.projects.settings = (function() { $('').text(RED._("sidebar.project.projectSettings.newKey")).appendTo(credentialSecretNewRow); var credentialSecretNewInput = $('').appendTo(credentialSecretNewRow).on("change keyup paste",checkFiles); - var credentialResetWarning = $('
' - + RED._("sidebar.project.projectSettings.credentialsAlert") + '
').hide().appendTo(credentialFormRows); + var credentialResetWarning = $('
' + RED._("sidebar.project.projectSettings.credentialsAlert") + '
').hide().appendTo(credentialFormRows); var hideEditForm = function() { @@ -1201,8 +1190,7 @@ RED.projects.settings = (function() { var repoContainer = $('').appendTo(pane); var title = $('

').text(RED._("sidebar.project.projectSettings.gitRemotes")).appendTo(repoContainer); - var editRepoButton = $('') + var editRepoButton = $('') .appendTo(title) .click(function(evt) { editRepoButton.attr('disabled',true); @@ -1352,8 +1340,7 @@ RED.projects.settings = (function() { remoteNameInputChanged = true; validateForm(); }); - $('').appendTo(row).find("small"); + $('').appendTo(row).find("small"); row = $('').appendTo(addRemoteDialog); $('').text(RED._("sidebar.project.projectSettings.url")).appendTo(row); var remoteURLInput = $('').appendTo(row).on("change keyup paste",function() { From 4fbf1fe780fc6d63b8de8490642f1fe3fffd5398 Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Wed, 6 Jun 2018 20:51:30 +0100 Subject: [PATCH 33/34] Add middle-button-drag to pan the workspace --- editor/js/ui/state.js | 3 ++- editor/js/ui/view.js | 46 ++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 45 insertions(+), 4 deletions(-) diff --git a/editor/js/ui/state.js b/editor/js/ui/state.js index 1b0990c58..b14bc915b 100644 --- a/editor/js/ui/state.js +++ b/editor/js/ui/state.js @@ -23,5 +23,6 @@ RED.state = { EXPORT: 6, IMPORT: 7, IMPORT_DRAGGING: 8, - QUICK_JOINING: 9 + QUICK_JOINING: 9, + PANNING: 10 } diff --git a/editor/js/ui/view.js b/editor/js/ui/view.js index ba568459c..d6c1bfa8c 100644 --- a/editor/js/ui/view.js +++ b/editor/js/ui/view.js @@ -58,7 +58,8 @@ RED.view = (function() { lastClickNode = null, dblClickPrimed = null, clickTime = 0, - clickElapsed = 0; + clickElapsed = 0, + scroll_position; var clipboard = ""; @@ -73,6 +74,8 @@ RED.view = (function() { var PORT_TYPE_INPUT = 1; var PORT_TYPE_OUTPUT = 0; + var chart = $("#chart"); + var outer = d3.select("#chart") .append("svg:svg") .attr("width", space_width) @@ -94,6 +97,16 @@ RED.view = (function() { .on("mousemove", canvasMouseMove) .on("mousedown", canvasMouseDown) .on("mouseup", canvasMouseUp) + .on("mouseenter", function() { + if (lasso) { + if (d3.event.buttons !== 1) { + lasso.remove(); + lasso = null; + } + } else if (mouse_mode === RED.state.PANNING && d3.event.buttons !== 4) { + resetMouseVars(); + } + }) .on("touchend", function() { clearTimeout(touchStartTime); touchStartTime = null; @@ -283,7 +296,6 @@ RED.view = (function() { function init() { RED.events.on("workspace:change",function(event) { - var chart = $("#chart"); if (event.old !== 0) { workspaceScrollPositions[event.old] = { left:chart.scrollLeft(), @@ -526,6 +538,15 @@ RED.view = (function() { function canvasMouseDown() { var point; + if (d3.event.button === 1) { + // Middle Click pan + mouse_mode = RED.state.PANNING; + mouse_position = [d3.event.pageX,d3.event.pageY] + scroll_position = [chart.scrollLeft(),chart.scrollTop()]; + + return; + } + if (!mousedown_node && !mousedown_link) { selected_link = null; updateSelection(); @@ -644,7 +665,6 @@ RED.view = (function() { function canvasMouseMove() { var i; var node; - mouse_position = d3.touches(this)[0]||d3.mouse(this); // Prevent touch scrolling... //if (d3.touches(this)[0]) { // d3.event.preventDefault(); @@ -655,6 +675,22 @@ RED.view = (function() { //if (point[0]-container.scrollLeft < 30 && container.scrollLeft > 0) { container.scrollLeft -= 15; } //console.log(d3.mouse(this),container.offsetWidth,container.offsetHeight,container.scrollLeft,container.scrollTop); + if (mouse_mode === RED.state.PANNING) { + + var pos = [d3.event.pageX,d3.event.pageY]; + var deltaPos = [ + mouse_position[0]-pos[0], + mouse_position[1]-pos[1] + ]; + + chart.scrollLeft(scroll_position[0]+deltaPos[0]) + chart.scrollTop(scroll_position[1]+deltaPos[1]) + return + } + + mouse_position = d3.touches(this)[0]||d3.mouse(this); + + if (lasso) { var ox = parseInt(lasso.attr("ox")); var oy = parseInt(lasso.attr("oy")); @@ -906,6 +942,10 @@ RED.view = (function() { function canvasMouseUp() { var i; var historyEvent; + if (mouse_mode === RED.state.PANNING) { + resetMouseVars(); + return + } if (mouse_mode === RED.state.QUICK_JOINING) { return; } From 3b0300b8349ea26506dbec71e65ebbcb42d02123 Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Wed, 6 Jun 2018 21:38:44 +0100 Subject: [PATCH 34/34] Cache flow library result to improve response time Fixes #1753 --- red/runtime/storage/index.js | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/red/runtime/storage/index.js b/red/runtime/storage/index.js index e0ef6d6b6..a2593eff1 100644 --- a/red/runtime/storage/index.js +++ b/red/runtime/storage/index.js @@ -25,6 +25,8 @@ var storageModule; var settingsAvailable; var sessionsAvailable; +var libraryFlowsCachedResult = null; + function moduleSelector(aSettings) { var toReturn; if (aSettings.storageModule) { @@ -156,7 +158,14 @@ var storageModuleInterface = { if (storageModule.hasOwnProperty("getAllFlows")) { return storageModule.getAllFlows(); } else { - return listFlows("/"); + if (libraryFlowsCachedResult) { + return Promise.resolve(libraryFlowsCachedResult); + } else { + return listFlows("/").then(function(result) { + libraryFlowsCachedResult = result; + return result; + }); + } } }, getFlow: function(fn) { @@ -178,6 +187,7 @@ var storageModuleInterface = { err.code = "forbidden"; return when.reject(err); } + libraryFlowsCachedResult = null; if (storageModule.hasOwnProperty("saveFlow")) { return storageModule.saveFlow(fn, data); } else {