mirror of
https://we.phorge.it/source/phorge.git
synced 2024-12-25 06:50:55 +01:00
00a1dec7a6
Summary: Fixes T12356. - In this mail, we currently render "6:00 AM". Instead, render "6:00 AM (PDT)" or similar. This is consistent with times in other modern Transaction mail. - Previously, we would render "UTC-7". Render "PDT" instead. For obscure zones with no known timezone abbreviation, fall back to "UTC-7". Test Plan: - Used `bin/calendar notify --minutes X` to trigger notifications, read email bodies. - Used this script to list all `T` values and checked them for sanity: ```lang=php <?php $now = new DateTime(); $locales = DateTimeZone::listIdentifiers(); foreach ($locales as $locale) { $zone = new DateTimeZone($locale); $now->setTimeZone($zone); printf( "%s (%s)\n", $locale, $now->format('T')); } ``` Reviewers: chad Reviewed By: chad Maniphest Tasks: T12356 Differential Revision: https://secure.phabricator.com/D17646
112 lines
3.2 KiB
PHP
112 lines
3.2 KiB
PHP
<?php
|
|
|
|
function phabricator_date($epoch, PhabricatorUser $user) {
|
|
return phabricator_format_local_time(
|
|
$epoch,
|
|
$user,
|
|
phutil_date_format($epoch));
|
|
}
|
|
|
|
function phabricator_relative_date($epoch, $user, $on = false) {
|
|
static $today;
|
|
static $yesterday;
|
|
|
|
if (!$today || !$yesterday) {
|
|
$now = time();
|
|
$today = phabricator_date($now, $user);
|
|
$yesterday = phabricator_date($now - 86400, $user);
|
|
}
|
|
|
|
$date = phabricator_date($epoch, $user);
|
|
|
|
if ($date === $today) {
|
|
return 'today';
|
|
}
|
|
|
|
if ($date === $yesterday) {
|
|
return 'yesterday';
|
|
}
|
|
|
|
return (($on ? 'on ' : '').$date);
|
|
}
|
|
|
|
function phabricator_time($epoch, $user) {
|
|
$time_key = PhabricatorTimeFormatSetting::SETTINGKEY;
|
|
return phabricator_format_local_time(
|
|
$epoch,
|
|
$user,
|
|
$user->getUserSetting($time_key));
|
|
}
|
|
|
|
function phabricator_datetime($epoch, $user) {
|
|
$time_key = PhabricatorTimeFormatSetting::SETTINGKEY;
|
|
return phabricator_format_local_time(
|
|
$epoch,
|
|
$user,
|
|
pht('%s, %s',
|
|
phutil_date_format($epoch),
|
|
$user->getUserSetting($time_key)));
|
|
}
|
|
|
|
function phabricator_datetimezone($epoch, $user) {
|
|
$datetime = phabricator_datetime($epoch, $user);
|
|
$timezone = phabricator_format_local_time($epoch, $user, 'T');
|
|
|
|
// Some obscure timezones just render as "+03" or "-09". Make these render
|
|
// as "UTC+3" instead.
|
|
if (preg_match('/^[+-]/', $timezone)) {
|
|
$timezone = (int)trim($timezone, '+');
|
|
if ($timezone < 0) {
|
|
$timezone = pht('UTC-%s', $timezone);
|
|
} else {
|
|
$timezone = pht('UTC+%s', $timezone);
|
|
}
|
|
}
|
|
|
|
return pht('%s (%s)', $datetime, $timezone);
|
|
}
|
|
|
|
/**
|
|
* This function does not usually need to be called directly. Instead, call
|
|
* @{function:phabricator_date}, @{function:phabricator_time}, or
|
|
* @{function:phabricator_datetime}.
|
|
*
|
|
* @param int Unix epoch timestamp.
|
|
* @param PhabricatorUser User viewing the timestamp.
|
|
* @param string Date format, as per DateTime class.
|
|
* @return string Formatted, local date/time.
|
|
*/
|
|
function phabricator_format_local_time($epoch, $user, $format) {
|
|
if (!$epoch) {
|
|
// If we're missing date information for something, the DateTime class will
|
|
// throw an exception when we try to construct an object. Since this is a
|
|
// display function, just return an empty string.
|
|
return '';
|
|
}
|
|
|
|
$user_zone = $user->getTimezoneIdentifier();
|
|
|
|
static $zones = array();
|
|
if (empty($zones[$user_zone])) {
|
|
$zones[$user_zone] = new DateTimeZone($user_zone);
|
|
}
|
|
$zone = $zones[$user_zone];
|
|
|
|
// NOTE: Although DateTime takes a second DateTimeZone parameter to its
|
|
// constructor, it ignores it if the date string includes timezone
|
|
// information. Further, it treats epoch timestamps ("@946684800") as having
|
|
// a UTC timezone. Set the timezone explicitly after constructing the object.
|
|
try {
|
|
$date = new DateTime('@'.$epoch);
|
|
} catch (Exception $ex) {
|
|
// NOTE: DateTime throws an empty exception if the format is invalid,
|
|
// just replace it with a useful one.
|
|
throw new Exception(
|
|
pht("Construction of a DateTime() with epoch '%s' ".
|
|
"raised an exception.", $epoch));
|
|
}
|
|
|
|
$date->setTimezone($zone);
|
|
|
|
return PhutilTranslator::getInstance()->translateDate($format, $date);
|
|
}
|