@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.)
hq.recaptime.dev/wiki/Phorge
phorge
phabricator
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
+30
-35
+15
-15
src/applications/calendar/controller/PhabricatorCalendarEventCancelController.php
+15
-15
src/applications/calendar/controller/PhabricatorCalendarEventCancelController.php
···
81
81
if ($is_cancelled) {
82
82
if ($sequence || $is_parent_cancelled) {
83
83
$title = pht('Cannot Reinstate Instance');
84
-
$paragraph = pht('Cannot reinstate an instance of a ' .
85
-
'cancelled recurring event.');
84
+
$paragraph = pht(
85
+
'Cannot reinstate an instance of a cancelled recurring event.');
86
86
$cancel = pht('Cancel');
87
87
$submit = null;
88
88
} else if ($is_parent) {
89
89
$title = pht('Reinstate Recurrence');
90
-
$paragraph = pht('Reinstate the entire series ' .
91
-
'of recurring events?');
92
-
$cancel = pht('Don\'t Reinstate Recurrence');
90
+
$paragraph = pht(
91
+
'Reinstate the entire series of recurring events?');
92
+
$cancel = pht("Don't Reinstate Recurrence");
93
93
$submit = pht('Reinstate Recurrence');
94
94
} else {
95
95
$title = pht('Reinstate Event');
96
96
$paragraph = pht('Reinstate this event?');
97
-
$cancel = pht('Don\'t Reinstate Event');
97
+
$cancel = pht("Don't Reinstate Event");
98
98
$submit = pht('Reinstate Event');
99
99
}
100
100
} else {
101
101
if ($sequence) {
102
102
$title = pht('Cancel Instance');
103
-
$paragraph = pht('Cancel just this instance ' .
104
-
'of a recurring event.');
105
-
$cancel = pht('Don\'t Cancel Instance');
103
+
$paragraph = pht(
104
+
'Cancel just this instance of a recurring event.');
105
+
$cancel = pht("Don't Cancel Instance");
106
106
$submit = pht('Cancel Instance');
107
107
} else if ($is_parent) {
108
108
$title = pht('Cancel Recurrence');
109
-
$paragraph = pht('Cancel the entire series ' .
110
-
'of recurring events?');
111
-
$cancel = pht('Don\'t Cancel Recurrence');
109
+
$paragraph = pht(
110
+
'Cancel the entire series of recurring events?');
111
+
$cancel = pht("Don't Cancel Recurrence");
112
112
$submit = pht('Cancel Recurrence');
113
113
} else {
114
114
$title = pht('Cancel Event');
115
-
$paragraph = pht('You can always reinstate ' .
116
-
'the event later.');
117
-
$cancel = pht('Don\'t Cancel Event');
115
+
$paragraph = pht(
116
+
'You can always reinstate the event later.');
117
+
$cancel = pht("Don't Cancel Event");
118
118
$submit = pht('Cancel Event');
119
119
}
120
120
}
-1
src/applications/calendar/controller/PhabricatorCalendarEventCommentController.php
-1
src/applications/calendar/controller/PhabricatorCalendarEventCommentController.php
+2
-4
src/applications/calendar/controller/PhabricatorCalendarEventDragController.php
+2
-4
src/applications/calendar/controller/PhabricatorCalendarEventDragController.php
···
43
43
44
44
45
45
$xactions[] = id(new PhabricatorCalendarEventTransaction())
46
-
->setTransactionType(
47
-
PhabricatorCalendarEventTransaction::TYPE_START_DATE)
46
+
->setTransactionType(PhabricatorCalendarEventTransaction::TYPE_START_DATE)
48
47
->setNewValue($start_value);
49
48
50
49
$xactions[] = id(new PhabricatorCalendarEventTransaction())
51
-
->setTransactionType(
52
-
PhabricatorCalendarEventTransaction::TYPE_END_DATE)
50
+
->setTransactionType(PhabricatorCalendarEventTransaction::TYPE_END_DATE)
53
51
->setNewValue($end_value);
54
52
55
53
+10
-10
src/applications/calendar/controller/PhabricatorCalendarEventEditController.php
+10
-10
src/applications/calendar/controller/PhabricatorCalendarEventEditController.php
···
302
302
} catch (PhabricatorApplicationTransactionValidationException $ex) {
303
303
$validation_exception = $ex;
304
304
$error_name = $ex->getShortMessage(
305
-
PhabricatorCalendarEventTransaction::TYPE_NAME);
305
+
PhabricatorCalendarEventTransaction::TYPE_NAME);
306
306
$error_start_date = $ex->getShortMessage(
307
-
PhabricatorCalendarEventTransaction::TYPE_START_DATE);
307
+
PhabricatorCalendarEventTransaction::TYPE_START_DATE);
308
308
$error_end_date = $ex->getShortMessage(
309
-
PhabricatorCalendarEventTransaction::TYPE_END_DATE);
309
+
PhabricatorCalendarEventTransaction::TYPE_END_DATE);
310
310
$error_recurrence_end_date = $ex->getShortMessage(
311
-
PhabricatorCalendarEventTransaction::TYPE_RECURRENCE_END_DATE);
311
+
PhabricatorCalendarEventTransaction::TYPE_RECURRENCE_END_DATE);
312
312
}
313
313
}
314
314
···
424
424
$recurrence_frequency_select = id(new AphrontFormSelectControl())
425
425
->setName('frequency')
426
426
->setOptions(array(
427
-
'daily' => pht('Daily'),
428
-
'weekly' => pht('Weekly'),
429
-
'monthly' => pht('Monthly'),
430
-
'yearly' => pht('Yearly'),
431
-
))
427
+
'daily' => pht('Daily'),
428
+
'weekly' => pht('Weekly'),
429
+
'monthly' => pht('Monthly'),
430
+
'yearly' => pht('Yearly'),
431
+
))
432
432
->setValue($frequency)
433
433
->setLabel(pht('Recurring Event Frequency'))
434
434
->setID($frequency_id)
···
583
583
array(
584
584
$crumbs,
585
585
$object_box,
586
-
),
586
+
),
587
587
array(
588
588
'title' => $page_title,
589
589
));
+1
-2
src/applications/calendar/controller/PhabricatorCalendarEventJoinController.php
+1
-2
src/applications/calendar/controller/PhabricatorCalendarEventJoinController.php
···
54
54
$new_status = array($viewer->getPHID() => $new_status);
55
55
56
56
$xaction = id(new PhabricatorCalendarEventTransaction())
57
-
->setTransactionType(
58
-
PhabricatorCalendarEventTransaction::TYPE_INVITE)
57
+
->setTransactionType(PhabricatorCalendarEventTransaction::TYPE_INVITE)
59
58
->setNewValue($new_status);
60
59
61
60
$editor = id(new PhabricatorCalendarEventEditor())
+2
-3
src/applications/calendar/controller/PhabricatorCalendarEventViewController.php
+2
-3
src/applications/calendar/controller/PhabricatorCalendarEventViewController.php
···
83
83
$draft = PhabricatorDraft::newFromUserAndKey($viewer, $event->getPHID());
84
84
if ($sequence) {
85
85
$comment_uri = $this->getApplicationURI(
86
-
'/event/comment/'.$event->getID().'/'.$sequence.'/');
86
+
'/event/comment/'.$event->getID().'/'.$sequence.'/');
87
87
} else {
88
88
$comment_uri = $this->getApplicationURI(
89
-
'/event/comment/'.$event->getID().'/');
89
+
'/event/comment/'.$event->getID().'/');
90
90
}
91
91
$add_comment_form = id(new PhabricatorApplicationTransactionCommentView())
92
92
->setUser($viewer)
···
372
372
$icon_display);
373
373
374
374
if (strlen($event->getDescription())) {
375
-
376
375
$description = PhabricatorMarkupEngine::renderOneObject(
377
376
id(new PhabricatorMarkupOneOff())->setContent($event->getDescription()),
378
377
'default',