franzz/spot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix Time Zone Name (when not using city names)

Browse Source
This commit is contained in:
Franzz
2020-04-20 15:42:42 +02:00
parent ead9cf3a49
commit 949275f657
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
inc/email.php
View File

@@ -95,6 +95,6 @@ class Email extends PhpObject {
}
private static function getTimeZoneCity($sTimeZone) {
return (strpos($sTimeZone, '/')!==false)?str_replace('_', ' ', explode('/', $sTimeZone)[1]):'';
return (strpos($sTimeZone, '/')!==false)?str_replace('_', ' ', explode('/', $sTimeZone)[1]):$sTimeZone;
}
}

7
script/spot.js
View File

@@ -252,8 +252,11 @@ function setElem(aoAnchor, asPath, oValue)
}
function getTimeZoneDesc(sTimeZoneName) {
var sCity = sTimeZoneName.split('/')[1].replace('_', ' ') || '';
return oSpot.lang('city_time', sCity);
if(sTimeZoneName.indexOf('/')==-1) return sTimeZoneName;
else {
var sCity = sTimeZoneName.split('/')[1].replace('_', ' ') || '';
return oSpot.lang('city_time', sCity);
}
}
$.prototype.addInput = function(sType, sName, sValue, aoEvents)