From d9275da2d4bd9c0bc54490736c7f56e70d7dd810 Mon Sep 17 00:00:00 2001 From: lkassianik Date: Wed, 20 Apr 2016 09:52:15 -0700 Subject: [PATCH] Better wording for cancelling/reinstating recurring events Summary: Fixes T10744 Test Plan: Create recurring event, cancel one instance, cancel the parent event, reinstate event. Wording in the reinstating dialog should be clear about reinstating only instances that haven't been individually cancelled. Reviewers: chad, epriestley, #blessed_reviewers Reviewed By: epriestley, #blessed_reviewers Subscribers: Korvin Maniphest Tasks: T10744 Differential Revision: https://secure.phabricator.com/D15770 --- .../controller/PhabricatorCalendarEventCancelController.php | 3 ++- .../controller/PhabricatorCalendarEventViewController.php | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/applications/calendar/controller/PhabricatorCalendarEventCancelController.php b/src/applications/calendar/controller/PhabricatorCalendarEventCancelController.php index 4be5a77d11..81736436a0 100644 --- a/src/applications/calendar/controller/PhabricatorCalendarEventCancelController.php +++ b/src/applications/calendar/controller/PhabricatorCalendarEventCancelController.php @@ -82,7 +82,8 @@ final class PhabricatorCalendarEventCancelController } 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 index 7c3b34bc09..98d3a2fe74 100644 --- a/src/applications/calendar/controller/PhabricatorCalendarEventViewController.php +++ b/src/applications/calendar/controller/PhabricatorCalendarEventViewController.php @@ -219,8 +219,8 @@ final class PhabricatorCalendarEventViewController $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');