Improve time zone selection

This commit is contained in:
Kijin Sung 2016-02-03 17:54:47 +09:00
parent 3c8b586fac
commit e971e7a725
4 changed files with 51 additions and 13 deletions

View file

@ -157,15 +157,22 @@ class installController extends install
$config['locale']['enabled_lang'] = array($config['locale']['default_lang']);
// Set the internal and default time zones.
$user_timezone = intval(get_time_zone_offset($time_zone ?: '+0900') / 3600);
switch ($user_timezone)
if (strpos($time_zone, '/') !== false)
{
case 9:
$config['locale']['default_timezone'] = 'Asia/Seoul'; break;
case 0:
$config['locale']['default_timezone'] = 'Etc/UTC'; break;
default:
$config['locale']['default_timezone'] = 'Etc/GMT' . ($user_timezone > 0 ? '-' : '+') . abs($user_timezone);
$config['locale']['default_timezone'] = $time_zone;
}
else
{
$user_timezone = intval(get_time_zone_offset($time_zone ?: '+0900') / 3600);
switch ($user_timezone)
{
case 9:
$config['locale']['default_timezone'] = 'Asia/Seoul'; break;
case 0:
$config['locale']['default_timezone'] = 'Etc/UTC'; break;
default:
$config['locale']['default_timezone'] = 'Etc/GMT' . ($user_timezone > 0 ? '-' : '+') . abs($user_timezone);
}
}
$config['locale']['internal_timezone'] = intval(date('Z'));