Minor linter and stylistic fixes

Summary: Self-explanatory.

Test Plan: `arc lint`

Reviewers: epriestley, #blessed_reviewers

Reviewed By: epriestley, #blessed_reviewers

Subscribers: epriestley, Korvin

Differential Revision: https://secure.phabricator.com/D13574
This commit is contained in:
Joshua Spence
2015-07-07 22:52:59 +10:00
parent f695dcea9e
commit a1c46d2586
6 changed files with 30 additions and 35 deletions

View File

@@ -81,40 +81,40 @@ final class PhabricatorCalendarEventCancelController
if ($is_cancelled) { if ($is_cancelled) {
if ($sequence || $is_parent_cancelled) { if ($sequence || $is_parent_cancelled) {
$title = pht('Cannot Reinstate Instance'); $title = pht('Cannot Reinstate Instance');
$paragraph = pht('Cannot reinstate an instance of a ' . $paragraph = pht(
'cancelled recurring event.'); 'Cannot reinstate an instance of a cancelled recurring event.');
$cancel = pht('Cancel'); $cancel = pht('Cancel');
$submit = null; $submit = null;
} else if ($is_parent) { } else if ($is_parent) {
$title = pht('Reinstate Recurrence'); $title = pht('Reinstate Recurrence');
$paragraph = pht('Reinstate the entire series ' . $paragraph = pht(
'of recurring events?'); 'Reinstate the entire series of recurring events?');
$cancel = pht('Don\'t Reinstate Recurrence'); $cancel = pht("Don't Reinstate Recurrence");
$submit = pht('Reinstate Recurrence'); $submit = pht('Reinstate Recurrence');
} else { } else {
$title = pht('Reinstate Event'); $title = pht('Reinstate Event');
$paragraph = pht('Reinstate this event?'); $paragraph = pht('Reinstate this event?');
$cancel = pht('Don\'t Reinstate Event'); $cancel = pht("Don't Reinstate Event");
$submit = pht('Reinstate Event'); $submit = pht('Reinstate Event');
} }
} else { } else {
if ($sequence) { if ($sequence) {
$title = pht('Cancel Instance'); $title = pht('Cancel Instance');
$paragraph = pht('Cancel just this instance ' . $paragraph = pht(
'of a recurring event.'); 'Cancel just this instance of a recurring event.');
$cancel = pht('Don\'t Cancel Instance'); $cancel = pht("Don't Cancel Instance");
$submit = pht('Cancel Instance'); $submit = pht('Cancel Instance');
} else if ($is_parent) { } else if ($is_parent) {
$title = pht('Cancel Recurrence'); $title = pht('Cancel Recurrence');
$paragraph = pht('Cancel the entire series ' . $paragraph = pht(
'of recurring events?'); 'Cancel the entire series of recurring events?');
$cancel = pht('Don\'t Cancel Recurrence'); $cancel = pht("Don't Cancel Recurrence");
$submit = pht('Cancel Recurrence'); $submit = pht('Cancel Recurrence');
} else { } else {
$title = pht('Cancel Event'); $title = pht('Cancel Event');
$paragraph = pht('You can always reinstate ' . $paragraph = pht(
'the event later.'); 'You can always reinstate the event later.');
$cancel = pht('Don\'t Cancel Event'); $cancel = pht("Don't Cancel Event");
$submit = pht('Cancel Event'); $submit = pht('Cancel Event');
} }
} }

View File

@@ -5,7 +5,6 @@ final class PhabricatorCalendarEventCommentController
private $id; private $id;
public function willProcessRequest(array $data) { public function willProcessRequest(array $data) {
$this->id = idx($data, 'id'); $this->id = idx($data, 'id');
} }

View File

@@ -43,13 +43,11 @@ final class PhabricatorCalendarEventDragController
$xactions[] = id(new PhabricatorCalendarEventTransaction()) $xactions[] = id(new PhabricatorCalendarEventTransaction())
->setTransactionType( ->setTransactionType(PhabricatorCalendarEventTransaction::TYPE_START_DATE)
PhabricatorCalendarEventTransaction::TYPE_START_DATE)
->setNewValue($start_value); ->setNewValue($start_value);
$xactions[] = id(new PhabricatorCalendarEventTransaction()) $xactions[] = id(new PhabricatorCalendarEventTransaction())
->setTransactionType( ->setTransactionType(PhabricatorCalendarEventTransaction::TYPE_END_DATE)
PhabricatorCalendarEventTransaction::TYPE_END_DATE)
->setNewValue($end_value); ->setNewValue($end_value);

View File

@@ -54,8 +54,7 @@ final class PhabricatorCalendarEventJoinController
$new_status = array($viewer->getPHID() => $new_status); $new_status = array($viewer->getPHID() => $new_status);
$xaction = id(new PhabricatorCalendarEventTransaction()) $xaction = id(new PhabricatorCalendarEventTransaction())
->setTransactionType( ->setTransactionType(PhabricatorCalendarEventTransaction::TYPE_INVITE)
PhabricatorCalendarEventTransaction::TYPE_INVITE)
->setNewValue($new_status); ->setNewValue($new_status);
$editor = id(new PhabricatorCalendarEventEditor()) $editor = id(new PhabricatorCalendarEventEditor())

View File

@@ -372,7 +372,6 @@ final class PhabricatorCalendarEventViewController
$icon_display); $icon_display);
if (strlen($event->getDescription())) { if (strlen($event->getDescription())) {
$description = PhabricatorMarkupEngine::renderOneObject( $description = PhabricatorMarkupEngine::renderOneObject(
id(new PhabricatorMarkupOneOff())->setContent($event->getDescription()), id(new PhabricatorMarkupOneOff())->setContent($event->getDescription()),
'default', 'default',