diff --git a/.vscode/launch.json b/.vscode/launch.json index 156b175..030faa4 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -4,11 +4,26 @@ { "type": "node", "request": "launch", - "name": "Nodemon", + "name": "Launch debug", "runtimeExecutable": "${workspaceFolder}/node_modules/nodemon/bin/nodemon.js", "skipFiles": ["/**"], "program": "${workspaceFolder}/spacedeck.js", - "cwd": "${workspaceFolder}" + "cwd": "${workspaceFolder}", + "env": { + "NODE_APP_INSTANCE" :"dev" + } + }, + { + "type": "node", + "request": "launch", + "name": "Launch ldap", + "runtimeExecutable": "${workspaceFolder}/node_modules/nodemon/bin/nodemon.js", + "skipFiles": ["/**"], + "program": "${workspaceFolder}/spacedeck.js", + "cwd": "${workspaceFolder}", + "env": { + "NODE_APP_INSTANCE" :"ldap" + } } ] } \ No newline at end of file diff --git a/spacedeck.js b/spacedeck.js index a5fb187..9e98209 100644 --- a/spacedeck.js +++ b/spacedeck.js @@ -33,7 +33,7 @@ console.log("Booting Spacedeck Open… (environment: " + app.get('env') + ")"); app.use(logger(isProduction ? 'combined' : 'dev')); i18n.expressBind(app, { - locales: ["en", "de", "fr", "oc", "es", "hu"], + locales: ["de", "en", "es", "fr", "hu", "oc"], defaultLocale: "en", cookieName: "spacedeck_locale", devMode: (app.get('env') == 'development') diff --git a/views/spacedeck.ejs b/views/spacedeck.ejs index 1f29ea1..d1305bb 100644 --- a/views/spacedeck.ejs +++ b/views/spacedeck.ejs @@ -74,17 +74,17 @@