D12768.id30691.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D12768.id30691.diff
View Options

	diff --git a/src/applications/calendar/controller/PhabricatorCalendarEventViewController.php b/src/applications/calendar/controller/PhabricatorCalendarEventViewController.php
	--- a/src/applications/calendar/controller/PhabricatorCalendarEventViewController.php
	+++ b/src/applications/calendar/controller/PhabricatorCalendarEventViewController.php
	@@ -179,13 +179,31 @@
	->setUser($viewer)
	->setObject($event);

	- $properties->addProperty(
	- pht('Starts'),
	- phabricator_datetime($event->getDateFrom(), $viewer));
	+ if ($event->getIsAllDay()) {
	+ $one_day_duration = 24 * 60 * 60 - 1;
	+ $event_duration = $event->getDateTo() - $event->getDateFrom();
	+
	+ if ($event_duration <= $one_day_duration) {
	+ $properties->addProperty(
	+ pht('Starts'),
	+ phabricator_date($event->getDateFrom(), $viewer));
	+ $properties->addProperty(
	+ pht('Ends'),
	+ phabricator_date($event->getDateTo(), $viewer));
	+ } else {
	+ $properties->addProperty(
	+ pht('Time'),
	+ phabricator_date($event->getDateFrom(), $viewer));
	+ }
	+ } else {
	+ $properties->addProperty(
	+ pht('Starts'),
	+ phabricator_datetime($event->getDateFrom(), $viewer));

	- $properties->addProperty(
	- pht('Ends'),
	- phabricator_datetime($event->getDateTo(), $viewer));
	+ $properties->addProperty(
	+ pht('Ends'),
	+ phabricator_datetime($event->getDateTo(), $viewer));
	+ }

	$properties->addProperty(
	pht('Host'),