Page MenuHomePhabricator

D15770.diff
No OneTemporary

D15770.diff

diff --git a/src/applications/calendar/controller/PhabricatorCalendarEventCancelController.php b/src/applications/calendar/controller/PhabricatorCalendarEventCancelController.php
--- a/src/applications/calendar/controller/PhabricatorCalendarEventCancelController.php
+++ b/src/applications/calendar/controller/PhabricatorCalendarEventCancelController.php
@@ -82,7 +82,8 @@
} else if ($is_parent) {
$title = pht('Reinstate Recurrence');
$paragraph = pht(
- 'Reinstate the entire series of recurring events?');
+ 'Reinstate all instances of this recurrence
+ that have not been individually cancelled?');
$cancel = pht("Don't Reinstate Recurrence");
$submit = pht('Reinstate Recurrence');
} else {
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
@@ -219,8 +219,8 @@
$reinstate_label = pht('Reinstate This Instance');
$cancel_disabled = (!$can_edit || $can_reinstate);
} else if ($event->getIsRecurrenceParent()) {
- $cancel_label = pht('Cancel Recurrence');
- $reinstate_label = pht('Reinstate Recurrence');
+ $cancel_label = pht('Cancel All');
+ $reinstate_label = pht('Reinstate All');
$cancel_disabled = !$can_edit;
} else {
$cancel_label = pht('Cancel Event');

File Metadata

Mime Type
text/plain
Expires
Fri, Oct 25, 12:04 PM (3 w, 4 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6715992
Default Alt Text
D15770.diff (1 KB)

Event Timeline