Merge pull request #178 from arillo/mnt

set language order

.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": ["<node_internals>/**"],
         "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": ["<node_internals>/**"],
+        "program": "${workspaceFolder}/spacedeck.js",
+        "cwd": "${workspaceFolder}",
+        "env": {
+          "NODE_APP_INSTANCE" :"ldap"
+        }
       }
     ]
   }

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')

views/spacedeck.ejs

@@ -74,17 +74,17 @@
 
   <script type="text/javascript">
     window.locales = {};
-    window.locales.en = {};
     window.locales.de = {};
-    window.locales.fr = {};
+    window.locales.en = {};
-    window.locales.oc = {};
     window.locales.es = {};
+    window.locales.fr = {};
     window.locales.hu = {};
-    window.locales.en.translation = <%- include("./../locales/en.js") %>;
+    window.locales.oc = {};
     window.locales.de.translation = <%- include("./../locales/de.js") %>;
-    window.locales.fr.translation = <%- include("./../locales/fr.js") %>;
+    window.locales.en.translation = <%- include("./../locales/en.js") %>;
-    window.locales.oc.translation = <%- include("./../locales/oc.js") %>;
     window.locales.es.translation = <%- include("./../locales/es.js") %>;
+    window.locales.fr.translation = <%- include("./../locales/fr.js") %>;
     window.locales.hu.translation = <%- include("./../locales/hu.js") %>;
+    window.locales.oc.translation = <%- include("./../locales/oc.js") %>;
   </script>
 </html>