Merge branch 'patch-2' into 'dev'

Added Language vars to super.ejs

See merge request Shinobi-Systems/Shinobi!96

languages/en_CA.json

@@ -663,6 +663,8 @@
    "Restart Core": "Restart Core",
    "Restart CRON": "Restart CRON",
    "Flush PM2 Logs": "Flush PM2 Logs",
+   "Controls and Logs": "Controls and Logs",
+   "Delete Logs": "Delete Logs",
    "Filter ID": "Filter ID",
    "Webdav Error": "Webdav Error",
    "WebdavErrorTextTryCreatingDir": "Cannot save. Trying to create directory.",

languages/sv_SE.json

@@ -148,7 +148,7 @@
 "Contains": "Innehåller",
 "Control Error": "Kontroll Fel",
 "Control": "Kontroll",
-"ControlErrorText1": "Kontroll är inte aktiverat",
+"ControlErrorText1": "Kontroller är inte aktiverat",
 "ControlErrorText2": "Kontrollera dina anslutnings detaljer. Du kan behöva peka Bas-URL på port 8000 eller 80. Kontrollera din autentisering info.",
 "Controllable": "Reglerbar",
 "Controls and Logs": "Kontroller och Loggar",
@@ -195,7 +195,7 @@
 "Delete Matches": "Ta bort Matchningar",
 "Delete Monitor State?": "Ta Bort Monitor State",
 "Delete Monitor States Preset": "Ta Bort Monitor States Preset",
-"Delete Monitors and Files": "Ta Bort Kamera och Filer",
+"Delete Monitors and Files": "Ta Bort Kameror och Filer",
 "Delete Monitor": "Ta Bort Kamera",
 "Delete Motionless Video": "Ta Bort Orörlig Video",
 "Delete Motionless Videos (Record)": "Ta Bort Orörlig Videor (Inspelad)",
@@ -434,6 +434,7 @@
 "Logging": "Loggning",
 "Login": "Logga in",
 "Logout": "Logga ut",
+"Logged in": "Inloggad",
 "Logs": "Loggar",
 "Loop Stream": "Loopa stream",
 "MB": "MB",
@@ -568,7 +569,7 @@
 "Please Wait...": "Vänligen Vänta...",
 "Plugin": "Plugin",
 "Points": "Punkter <small>När du lägger till punkter klickar du på kanten av polygonen.</small>",
-"Pop": "Pop",
+"Pop": "Popup",
 "Popout Monitor on Event": "Popout Kamera vid Händelse",
 "Port": "Port",
 "Pose": "Pose",
@@ -846,9 +847,9 @@
 "Zip and Download": "Packa och Ladda ner",
 "Zipping Videos": "Packar Videor",
 "Zoom In Stop": "Zooma In Stopp <small>URL-Adress</small>",
-"Zoom In": "Zooma In <small>URL-Adress</small>",
+"Zoom In": "Zooma In",
 "Zoom Out Stop": "Zooma Ut Stopp <small>URL-Adress</small>",
-"Zoom Out": "Zooma Ut <small>URL-Adress</small>",
+"Zoom Out": "Zooma Ut",
 "\"No Motion\" Detector": "\"No Motion\" - Detektor",
 "a day": "en dag",
 "a few seconds": "några sekunder",

web/pages/super.ejs

@@ -78,7 +78,7 @@
                                     <a class="nav-link" data-toggle="tab" href="#config" role="tab"><%-lang['Configuration']%></a>
                                 </li>
                                 <li class="nav-item">
-                                    <a class="nav-link" data-toggle="tab" href="#system" role="tab">Controls and Logs</a>
+                                    <a class="nav-link" data-toggle="tab" href="#system" role="tab"><%-lang['Controls and Logs']%></a>
                                 </li>
                                 <li class="nav-item">
                                     <a class="nav-link" data-toggle="tab" href="#changeSuperPreferences" role="tab"><%-lang['Preferences']%></a>
@@ -401,7 +401,7 @@ $.conf.f.submit(function(e){
         e.html='<p>This is a change being applied to the configuration file (conf.json). Are you sure you want to do this? You must restart Shinobi for these changes to take effect. <b>The JSON below is what you are about to save.</b></p>'
         e.html+='<pre>'+JSON.stringify($.parseJSON($.conf.draw.val()),null,3)+'</pre>'
         $.confirm.body.html(e.html)
-        $.confirm.click({title:'Save',class:'btn-success'},function(){
+        $.confirm.click({title:lang.Save,class:'btn-success'},function(){
             $.post('<%=originalURL%><%=config.webPaths.superApiPrefix%>'+$user.sessionKey+'/system/configure',{
                 data: $.conf.draw.val()
             },function(data){
@@ -467,10 +467,10 @@ $.system.e.find('[system]').click(function(e){
     switch($(this).attr('system')){
         case'deleteLogs':
             $.confirm.e.modal('show');
-            $.confirm.title.html('Delete Logs <small>'+e.u+'</small>')
+            $.confirm.title.html('<%=lang['Delete Logs']%> <small>'+e.u+'</small>')
             e.html='Do you want to delete these logs? User logs will <b>not</b> be deleted.'
             $.confirm.body.html(e.html)
-            $.confirm.click({title:'Delete',class:'btn-danger'},function(){
+            $.confirm.click({title:lang.Delete,class:'btn-danger'},function(){
                 // $.ccio.cx({f:'logs',ff:'delete',ke:'$'})
                 $.get('<%=originalURL%><%=config.webPaths.superApiPrefix%>'+$user.sessionKey+'/logs/delete',function(data){
                     console.log(data)
@@ -480,9 +480,9 @@ $.system.e.find('[system]').click(function(e){
         break;
         case'update':
             $.confirm.e.modal('show')
-            $.confirm.title.html('Update Shinobi?')
+            $.confirm.title.html('<%=lang.Update%> Shinobi?')
             $.confirm.body.html('Updating Shinobi means overwriting files. If you have modified any files yourself you should update Shinobi manually.')
-            $.confirm.click({title:'Update',class:'btn-danger'},function(){
+            $.confirm.click({title:lang.Update,class:'btn-danger'},function(){
                 // $.ccio.cx({f:'system',ff:'update'})
                 $.get('<%=originalURL%><%=config.webPaths.superApiPrefix%>'+$user.sessionKey+'/system/update',function(data){
                     console.log(data)
@@ -509,9 +509,9 @@ $.system.e.find('[restart]').click(function(e){
             break;
         }
     })
-    $.confirm.title.html('Restart?')
+    $.confirm.title.html('<%=lang.Restart%>?')
     $.confirm.body.html(e.html)
-    $.confirm.click({title:'Restart',class:'btn-danger'},function(){
+    $.confirm.click({title:lang.Restart,class:'btn-danger'},function(){
         // $.ccio.cx({f:'system',ff:'restart',target:e.target})
         $.get('<%=originalURL%><%=config.webPaths.superApiPrefix%>'+$user.sessionKey+'/system/restart/'+encodeURIComponent(e.target),function(data){
             console.log(data)