diff --git a/libs/language.js b/libs/language.js index 6b4de8ee..93fbe72d 100644 --- a/libs/language.js +++ b/libs/language.js @@ -20,38 +20,40 @@ module.exports = function(s,config){ //load languages dynamically s.loadedLanguages={} s.loadedLanguages[config.language]=lang; - s.getLanguageFile=function(rule){ - if(rule&&rule!==''){ - var file=s.loadedLanguages[file] + s.getLanguageFile = function(rule){ + if(rule && rule !== ''){ + var file = s.loadedLanguages[file] if(!file){ try{ - s.loadedLanguages[rule]=require(s.location.languages+'/'+rule+'.json') - file=s.loadedLanguages[rule] + s.loadedLanguages[rule] = require(s.location.languages+'/'+rule+'.json') + s.loadedLanguages[rule] = Object.assign(lang,s.loadedLanguages[rule]) + file = s.loadedLanguages[rule] }catch(err){ - file=lang + file = lang } } }else{ - file=lang + file = lang } return file } //load defintions dynamically s.loadedDefinitons={} s.loadedDefinitons[config.language]=definitions; - s.getDefinitonFile=function(rule){ - if(rule&&rule!==''){ - var file=s.loadedDefinitons[file] + s.getDefinitonFile = function(rule){ + if(rule && rule !== ''){ + var file = s.loadedDefinitons[file] if(!file){ try{ - s.loadedDefinitons[rule]=require(s.location.definitions+'/'+rule+'.json') - file=s.loadedDefinitons[rule] + s.loadedDefinitons[rule] = require(s.location.definitions+'/'+rule+'.json') + s.loadedDefinitons[rule] = Object.assign(definitions,s.loadedDefinitons[rule]) + file = s.loadedDefinitons[rule] }catch(err){ - file=definitions + file = definitions } } }else{ - file=definitions + file = definitions } return file } diff --git a/web/libs/js/main.dash2.js b/web/libs/js/main.dash2.js index 533cbb26..31806b37 100644 --- a/web/libs/js/main.dash2.js +++ b/web/libs/js/main.dash2.js @@ -427,16 +427,16 @@ switch($user.details.lang){ case'humanReadMode': switch(d){ case'idle': - k.mode='<%-cleanLang(lang['Idle'])%>' + k.mode=lang['Idle'] break; case'stop': - k.mode='<%-cleanLang(lang['Disabled'])%>' + k.mode=lang['Disabled'] break; case'record': - k.mode='<%-cleanLang(lang['Record'])%>' + k.mode=lang['Record'] break; case'start': - k.mode='<%-cleanLang(lang['Watch Only'])%>' + k.mode=lang['Watch Only'] break; } return k.mode @@ -616,7 +616,7 @@ switch($user.details.lang){ return $.ccio.init('tf',d.time,user)+'.'+d.ext break; case'filters': - k.tmp=''; + k.tmp=''; $.each(user.details.filters,function(n,v){ k.tmp+='' }); @@ -696,7 +696,7 @@ switch($user.details.lang){ case'hls':case'flv':case'mp4': if(d.p.find('video')[0].paused){ if(d.d.signal_check_log==1){ - d.log={type:'Stream Check',msg:'<%-cleanLang(lang.clientStreamFailedattemptingReconnect)%>'} + d.log={type:'Stream Check',msg:lang.clientStreamFailedattemptingReconnect} $.ccio.tm(4,d,'#logs,.monitor_item[mid="'+d.id+'"][ke="'+d.ke+'"][auth="'+user.auth_token+'"] .logs') } $.ccio.cx({f:'monitor',ff:'watch_on',id:d.id},user); @@ -940,9 +940,9 @@ switch($user.details.lang){ d.hr=parseInt(d.startMoment.format('HH')), d.per=parseInt(d.hr/24*100); d.circle='
'+d.hr+'
' - tmp+='
  • '+d.circle+'
    <%-cleanLang(lang.Start)%> : '+d.startMoment.format('h:mm:ss , MMMM Do YYYY')+'
    <%-cleanLang(lang.End)%> : '+d.endMoment.format('h:mm:ss , MMMM Do YYYY')+'
    '+(parseInt(d.size)/1000000).toFixed(2)+'mb
    ' + tmp+='
  • '+d.circle+'
    '+lang.Start+' : '+d.startMoment.format('h:mm:ss , MMMM Do YYYY')+'
    '+lang.End+' : '+d.endMoment.format('h:mm:ss , MMMM Do YYYY')+'
    '+(parseInt(d.size)/1000000).toFixed(2)+'mb
    ' <% if(config.DropboxAppKey){ %> tmp+='' <% } %> - tmp+='
  • '; + tmp+=''; $(z).each(function(n,v){ v=$(v); if(v.find('.video-item').length>10){v.find('.video-item:last').remove()} @@ -950,7 +950,7 @@ switch($user.details.lang){ break; case 1://monitor icon d.src=placeholder.getData(placeholder.plcimg({bgcolor:'#b57d00',text:'...'})); - tmp+='
    '+d.name+'
    '+d.mid+'
    <%-cleanLang(lang['Save as'])%> : '+d.ext+'
    Status : '+d.status+'
    ' + tmp+='
    '+d.name+'
    '+d.mid+'
    '+lang['Save as']+' : '+d.ext+'
    Status : '+d.status+'
    ' tmp+='
    ' var buttons = { "Pop": { @@ -1001,7 +1001,7 @@ switch($user.details.lang){ tmp+='
    '; tmp+='
    ' tmp+='
    '; - tmp+='
    ' + tmp+='
    ' $.each([ {label:'Currently Detected',tag:'stream-detected-count'} ],function(n,v){ @@ -1011,7 +1011,7 @@ switch($user.details.lang){ tmp+='
    '; tmp+='
    '; tmp+='
    '; - tmp+='
    '+d.name+', <%-cleanLang(lang['Recording FPS'])%> : '+d.fps+'
    '; + tmp+='
    '+d.name+', '+lang['Recording FPS']+' : '+d.fps+'
    '; tmp+='
    '; tmp+='
    '//start of btn list var buttons = { @@ -1203,18 +1203,18 @@ switch($user.details.lang){ tmp+='
    ' tmp+=' ' @@ -1222,29 +1222,29 @@ switch($user.details.lang){ tmp+='
    ' tmp+=' ' tmp+='
    ' tmp+='
    ' tmp+=' ' tmp+='
    ' tmp+='
    ' tmp+=' ' tmp+='
    ' @@ -1260,35 +1260,35 @@ switch($user.details.lang){ tmp+='
    '; tmp+=' '; tmp+='
    '; tmp+='
    '; tmp+=' '; tmp+='
    '; tmp+='
    '; tmp+=' '; tmp+='
    '; tmp+='
    '; @@ -1300,10 +1300,10 @@ switch($user.details.lang){ if(!d.secure){d.secure="0"} tmp+='
    ' tmp+='

    '+d.host+' '+d.ke+' 

    ' - tmp+='
    ' - tmp+='
    ' - tmp+='
    ' - tmp+='
    ' + tmp+='
    ' + tmp+='
    ' + tmp+='
    ' + tmp+='
    ' tmp+='
    '; break; case 'form-group'://Input Map Selector @@ -1346,7 +1346,7 @@ switch($user.details.lang){ case 'input-map-selector'://Input Map Selector if(!d.map){d.map=''} tmp+='
    ' - tmp+='