Merge branch 'patch-3' into 'dev'

Added language vars to folder.js

See merge request Shinobi-Systems/Shinobi!97

camera.js

@@ -21,10 +21,10 @@ loadLib('extenders')(s)
 var config = loadLib('config')(s)
 //basic functions
 loadLib('basic')(s,config)
-//working directories : videos, streams, fileBin..
-loadLib('folders')(s,config)
 //language loader
 var lang = loadLib('language')(s,config)
+//working directories : videos, streams, fileBin..
+loadLib('folders')(s,config,lang)
 //code test module
 loadLib('codeTester')(s,config,lang)
 //get version

languages/en_CA.json

@@ -939,6 +939,7 @@
    "Copy Recording Settings":"Copy Recording Settings",
    "Copy Detector Settings":"Copy Detector Settings",
    "Monitors to Copy to":"Monitors to Copy to",
+   "No Sound": "No Sound",
    "Notification Sound":"Notification Sound",
    "Alert Sound":"Alert Sound",
    "Alert Sound Delay":"Alert Sound Delay",

libs/folders.js

@@ -1,5 +1,5 @@
 var fs = require('fs');
-module.exports = function(s,config){
+module.exports = function(s,config,lang){
     //directories
     s.group = {}
     if(!config.windowsTempDir&&s.isWin===true){config.windowsTempDir='C:/Windows/Temp'}
@@ -41,7 +41,7 @@ module.exports = function(s,config){
     }
     //additional storage areas
     s.listOfStorage = [{
-        name: "Main",
+        name: lang['Default'],
         value: ""
     }]
     s.dir.addStorage.forEach(function(v,n){
@@ -57,7 +57,7 @@ module.exports = function(s,config){
     //get audio files list
     s.listOfAudioFiles = [
         {
-            name:"No Sound",
+            name:lang['No Sound'],
             value:""
         }
     ]
@@ -70,7 +70,7 @@ module.exports = function(s,config){
     //get themes list
     s.listOfThemes = [
         {
-            name:"Default",
+            name:lang['Default'],
             value:""
         }
     ]