}
$data[] = array(
'region' => $o['region'],
- 'displayArea' => $o['display_area']
+ 'area' => $o['area'],
+ 'displayArea' => $o['displayArea']
);
}
'totalProperty' => 'total',
'fields' => array(
'region',
+ 'area',
'displayArea'
)
),
continue;
}
- $displayOffset = '(GMT ' . ((substr($ce->timeOffset, 0, 1) == '-') ? '' : '+') . $ce->timeOffset . ')';
- $offsetAr = explode(':', $ce->timeOffset);
-
+ $displayArea = str_replace('_', ' ', $ar[1]);
+
+ $timeOffset = ((substr($ce->timeOffset, 0, 1) == '-') ? '' : '+') . $ce->timeOffset;
+ $displayOffset = '(GMT ' . $timeOffset . ')';
self::$timezones[$ce->Name] = array(
'region' => $ar[0],
'area' => $ar[1],
- 'displayName' => $ce->Name . ' ' . $displayOffset,
- 'displayArea' => $ar[1] . ' ' . $displayOffset,
- 'decimalOffset' => ($offsetAr[0] + ($offsetAr[1] / 60))
+ 'displayName' => $ar[0] . '/' . $displayArea . ' ' . $displayOffset,
+ 'displayArea' => $displayArea . ' ' . $displayOffset,
+ 'timeOffset' => $timeOffset
);
}