Fix Time Zone Name (when not using city names)

This commit is contained in:
2020-04-20 15:42:42 +02:00
parent ead9cf3a49
commit 949275f657
2 changed files with 6 additions and 3 deletions

View File

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

View File

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