diff --git a/nodes/core/analysis/locales/ja/72-sentiment.html b/nodes/core/locales/ja/analysis/72-sentiment.html similarity index 100% rename from nodes/core/analysis/locales/ja/72-sentiment.html rename to nodes/core/locales/ja/analysis/72-sentiment.html diff --git a/nodes/core/core/locales/ja/20-inject.html b/nodes/core/locales/ja/core/20-inject.html similarity index 100% rename from nodes/core/core/locales/ja/20-inject.html rename to nodes/core/locales/ja/core/20-inject.html diff --git a/nodes/core/core/locales/ja/25-catch.html b/nodes/core/locales/ja/core/25-catch.html similarity index 100% rename from nodes/core/core/locales/ja/25-catch.html rename to nodes/core/locales/ja/core/25-catch.html diff --git a/nodes/core/core/locales/ja/25-status.html b/nodes/core/locales/ja/core/25-status.html similarity index 100% rename from nodes/core/core/locales/ja/25-status.html rename to nodes/core/locales/ja/core/25-status.html diff --git a/nodes/core/core/locales/ja/58-debug.html b/nodes/core/locales/ja/core/58-debug.html similarity index 100% rename from nodes/core/core/locales/ja/58-debug.html rename to nodes/core/locales/ja/core/58-debug.html diff --git a/nodes/core/core/locales/ja/60-link.html b/nodes/core/locales/ja/core/60-link.html similarity index 100% rename from nodes/core/core/locales/ja/60-link.html rename to nodes/core/locales/ja/core/60-link.html diff --git a/nodes/core/core/locales/ja/75-exec.html b/nodes/core/locales/ja/core/75-exec.html similarity index 100% rename from nodes/core/core/locales/ja/75-exec.html rename to nodes/core/locales/ja/core/75-exec.html diff --git a/nodes/core/core/locales/ja/80-function.html b/nodes/core/locales/ja/core/80-function.html similarity index 100% rename from nodes/core/core/locales/ja/80-function.html rename to nodes/core/locales/ja/core/80-function.html diff --git a/nodes/core/core/locales/ja/80-template.html b/nodes/core/locales/ja/core/80-template.html similarity index 100% rename from nodes/core/core/locales/ja/80-template.html rename to nodes/core/locales/ja/core/80-template.html diff --git a/nodes/core/core/locales/ja/89-delay.html b/nodes/core/locales/ja/core/89-delay.html similarity index 100% rename from nodes/core/core/locales/ja/89-delay.html rename to nodes/core/locales/ja/core/89-delay.html diff --git a/nodes/core/core/locales/ja/89-trigger.html b/nodes/core/locales/ja/core/89-trigger.html similarity index 100% rename from nodes/core/core/locales/ja/89-trigger.html rename to nodes/core/locales/ja/core/89-trigger.html diff --git a/nodes/core/core/locales/ja/90-comment.html b/nodes/core/locales/ja/core/90-comment.html similarity index 100% rename from nodes/core/core/locales/ja/90-comment.html rename to nodes/core/locales/ja/core/90-comment.html diff --git a/nodes/core/core/locales/ja/98-unknown.html b/nodes/core/locales/ja/core/98-unknown.html similarity index 100% rename from nodes/core/core/locales/ja/98-unknown.html rename to nodes/core/locales/ja/core/98-unknown.html diff --git a/nodes/core/io/locales/ja/05-tls.html b/nodes/core/locales/ja/io/05-tls.html similarity index 100% rename from nodes/core/io/locales/ja/05-tls.html rename to nodes/core/locales/ja/io/05-tls.html diff --git a/nodes/core/io/locales/ja/10-mqtt.html b/nodes/core/locales/ja/io/10-mqtt.html similarity index 100% rename from nodes/core/io/locales/ja/10-mqtt.html rename to nodes/core/locales/ja/io/10-mqtt.html diff --git a/nodes/core/io/locales/ja/21-httpin.html b/nodes/core/locales/ja/io/21-httpin.html similarity index 100% rename from nodes/core/io/locales/ja/21-httpin.html rename to nodes/core/locales/ja/io/21-httpin.html diff --git a/nodes/core/io/locales/ja/21-httprequest.html b/nodes/core/locales/ja/io/21-httprequest.html similarity index 100% rename from nodes/core/io/locales/ja/21-httprequest.html rename to nodes/core/locales/ja/io/21-httprequest.html diff --git a/nodes/core/io/locales/ja/22-websocket.html b/nodes/core/locales/ja/io/22-websocket.html similarity index 100% rename from nodes/core/io/locales/ja/22-websocket.html rename to nodes/core/locales/ja/io/22-websocket.html diff --git a/nodes/core/io/locales/ja/23-watch.html b/nodes/core/locales/ja/io/23-watch.html similarity index 100% rename from nodes/core/io/locales/ja/23-watch.html rename to nodes/core/locales/ja/io/23-watch.html diff --git a/nodes/core/io/locales/ja/31-tcpin.html b/nodes/core/locales/ja/io/31-tcpin.html similarity index 100% rename from nodes/core/io/locales/ja/31-tcpin.html rename to nodes/core/locales/ja/io/31-tcpin.html diff --git a/nodes/core/io/locales/ja/32-udp.html b/nodes/core/locales/ja/io/32-udp.html similarity index 100% rename from nodes/core/io/locales/ja/32-udp.html rename to nodes/core/locales/ja/io/32-udp.html diff --git a/nodes/core/logic/locales/ja/10-switch.html b/nodes/core/locales/ja/logic/10-switch.html similarity index 100% rename from nodes/core/logic/locales/ja/10-switch.html rename to nodes/core/locales/ja/logic/10-switch.html diff --git a/nodes/core/logic/locales/ja/15-change.html b/nodes/core/locales/ja/logic/15-change.html similarity index 100% rename from nodes/core/logic/locales/ja/15-change.html rename to nodes/core/locales/ja/logic/15-change.html diff --git a/nodes/core/logic/locales/ja/16-range.html b/nodes/core/locales/ja/logic/16-range.html similarity index 100% rename from nodes/core/logic/locales/ja/16-range.html rename to nodes/core/locales/ja/logic/16-range.html diff --git a/nodes/core/logic/locales/ja/17-split.html b/nodes/core/locales/ja/logic/17-split.html similarity index 100% rename from nodes/core/logic/locales/ja/17-split.html rename to nodes/core/locales/ja/logic/17-split.html diff --git a/nodes/core/logic/locales/ja/18-sort.html b/nodes/core/locales/ja/logic/18-sort.html similarity index 100% rename from nodes/core/logic/locales/ja/18-sort.html rename to nodes/core/locales/ja/logic/18-sort.html diff --git a/nodes/core/logic/locales/ja/19-batch.html b/nodes/core/locales/ja/logic/19-batch.html similarity index 100% rename from nodes/core/logic/locales/ja/19-batch.html rename to nodes/core/locales/ja/logic/19-batch.html diff --git a/nodes/core/parsers/locales/ja/70-CSV.html b/nodes/core/locales/ja/parsers/70-CSV.html similarity index 100% rename from nodes/core/parsers/locales/ja/70-CSV.html rename to nodes/core/locales/ja/parsers/70-CSV.html diff --git a/nodes/core/parsers/locales/ja/70-HTML.html b/nodes/core/locales/ja/parsers/70-HTML.html similarity index 100% rename from nodes/core/parsers/locales/ja/70-HTML.html rename to nodes/core/locales/ja/parsers/70-HTML.html diff --git a/nodes/core/parsers/locales/ja/70-JSON.html b/nodes/core/locales/ja/parsers/70-JSON.html similarity index 100% rename from nodes/core/parsers/locales/ja/70-JSON.html rename to nodes/core/locales/ja/parsers/70-JSON.html diff --git a/nodes/core/parsers/locales/ja/70-XML.html b/nodes/core/locales/ja/parsers/70-XML.html similarity index 100% rename from nodes/core/parsers/locales/ja/70-XML.html rename to nodes/core/locales/ja/parsers/70-XML.html diff --git a/nodes/core/parsers/locales/ja/70-YAML.html b/nodes/core/locales/ja/parsers/70-YAML.html similarity index 100% rename from nodes/core/parsers/locales/ja/70-YAML.html rename to nodes/core/locales/ja/parsers/70-YAML.html diff --git a/nodes/core/storage/locales/ja/28-tail.html b/nodes/core/locales/ja/storage/28-tail.html similarity index 100% rename from nodes/core/storage/locales/ja/28-tail.html rename to nodes/core/locales/ja/storage/28-tail.html diff --git a/nodes/core/storage/locales/ja/50-file.html b/nodes/core/locales/ja/storage/50-file.html similarity index 100% rename from nodes/core/storage/locales/ja/50-file.html rename to nodes/core/locales/ja/storage/50-file.html diff --git a/red/runtime/nodes/registry/loader.js b/red/runtime/nodes/registry/loader.js index cc1ba37b5..f88463609 100644 --- a/red/runtime/nodes/registry/loader.js +++ b/red/runtime/nodes/registry/loader.js @@ -376,9 +376,18 @@ function addModule(module) { } function loadNodeHelp(node,lang) { - var dir = path.dirname(node.template); var base = path.basename(node.template); - var localePath = path.join(dir,"locales",lang,base); + var localePath = undefined; + if (node.module === 'node-red') { + var cat_dir = path.dirname(node.template); + var cat = path.basename(cat_dir); + var dir = path.dirname(cat_dir); + localePath = path.join(dir, "locales", lang, cat, base) + } + else { + var dir = path.dirname(node.template); + localePath = path.join(dir,"locales",lang,base); + } try { // TODO: make this async var content = fs.readFileSync(localePath, "utf8")