lucas.mathieu/cachet-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up the timezone listings

Browse Source
This commit is contained in:
James Brooks
2016-10-07 12:47:55 +01:00
parent a8261d23c0
commit eb470abf09
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Composers/TimezoneLocaleComposer.php
+14 -5
View File
@@ -16,6 +16,13 @@ use DateTimeZone;
use Illuminate\Contracts\Config\Repository; use Illuminate\Contracts\Config\Repository;
use Illuminate\Contracts\View\View; use Illuminate\Contracts\View\View;
/**
* This is the timezone locale composer.
*
* @author Joseph Cohen <joe@alt-three.com>
* @author James Brooks <james@alt-three.com>
* @author Graham Campbell <graham@alt-three.com>
*/
class TimezoneLocaleComposer class TimezoneLocaleComposer
{ {
/** /**
@@ -57,6 +64,7 @@ class TimezoneLocaleComposer
$langs = call_user_func_array('array_merge', $langs); $langs = call_user_func_array('array_merge', $langs);
$regions = [ $regions = [
'UTC' => DateTimeZone::UTC,
'Africa' => DateTimeZone::AFRICA, 'Africa' => DateTimeZone::AFRICA,
'America' => DateTimeZone::AMERICA, 'America' => DateTimeZone::AMERICA,
'Antarctica' => DateTimeZone::ANTARCTICA, 'Antarctica' => DateTimeZone::ANTARCTICA,
@@ -66,7 +74,6 @@ class TimezoneLocaleComposer
'Europe' => DateTimeZone::EUROPE, 'Europe' => DateTimeZone::EUROPE,
'Indian' => DateTimeZone::INDIAN, 'Indian' => DateTimeZone::INDIAN,
'Pacific' => DateTimeZone::PACIFIC, 'Pacific' => DateTimeZone::PACIFIC,
'UTC' => DateTimeZone::UTC,
]; ];
$timezones = []; $timezones = [];
@@ -78,10 +85,12 @@ class TimezoneLocaleComposer
// Lets sample the time there right now // Lets sample the time there right now
$time = new DateTime(null, new DateTimeZone($timezone)); $time = new DateTime(null, new DateTimeZone($timezone));
$ampm = $time->format('H') > 12 ? ' ('.$time->format('g:i a').')' : ''; if ($timezone !== 'UTC') {
// Remove region name and add a sample time
// Remove region name and add a sample time $timezones[$name][$timezone] = substr($timezone, strlen($name) + 1).' - '.$time->format('H:i');
$timezones[$name][$timezone] = substr($timezone, strlen($name) + 1).' - '.$time->format('H:i').$ampm; } else {
$timezones[$name][$timezone] = 'UTC - '.$time->format('H:i');
}
$timezones[$name] = str_replace('_', ' ', $timezones[$name]); $timezones[$name] = str_replace('_', ' ', $timezones[$name]);
} }