archive/phabricator
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Better wording for cancelling/reinstating recurring events

Browse Source 
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
This commit is contained in:
lkassianik
2016-04-20 09:52:15 -07:00
parent eeccaf99b6
commit d9275da2d4
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/applications/calendar/controller/PhabricatorCalendarEventCancelController.php
View File

@@ -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 {

4
src/applications/calendar/controller/PhabricatorCalendarEventViewController.php
View File

@@ -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');