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

Merge branch 'master' into 0.17

Browse Source
This commit is contained in:
Nick O'Leary
2017-04-11 14:53:44 +01:00
parent 10f94148af 36e1b2ba08
commit bfb548636e
6 changed files with 40 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
red/runtime/nodes/registry/localfilesystem.js
View File

@@ -80,6 +80,8 @@ function getLocalFile(file) {
* @return an array of fully-qualified paths to .js files
*/
function getLocalNodeFiles(dir) {
dir = path.resolve(dir);
var result = [];
var files = [];
try {
@@ -218,7 +220,7 @@ function getNodeFiles(disableNodePathScan) {
if (settings.coreNodesDir) {
nodeFiles = getLocalNodeFiles(path.resolve(settings.coreNodesDir));
var defaultLocalesPath = path.resolve(path.join(settings.coreNodesDir,"core","locales"));
var defaultLocalesPath = path.join(settings.coreNodesDir,"core","locales");
i18n.registerMessageCatalog("node-red",defaultLocalesPath,"messages.json");
}