revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-12-24 14:30:56 +01:00
Code Issues 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
Show stats 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) { } else if ($is_parent) {
$title = pht('Reinstate Recurrence'); $title = pht('Reinstate Recurrence');
$paragraph = pht( $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"); $cancel = pht("Don't Reinstate Recurrence");
$submit = pht('Reinstate Recurrence'); $submit = pht('Reinstate Recurrence');
} else { } else {

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

@ -219,8 +219,8 @@ final class PhabricatorCalendarEventViewController
$reinstate_label = pht('Reinstate This Instance'); $reinstate_label = pht('Reinstate This Instance');
$cancel_disabled = (!$can_edit || $can_reinstate); $cancel_disabled = (!$can_edit || $can_reinstate);
} else if ($event->getIsRecurrenceParent()) { } else if ($event->getIsRecurrenceParent()) {
$cancel_label = pht('Cancel Recurrence'); $cancel_label = pht('Cancel All');
$reinstate_label = pht('Reinstate Recurrence'); $reinstate_label = pht('Reinstate All');
$cancel_disabled = !$can_edit; $cancel_disabled = !$can_edit;
} else { } else {
$cancel_label = pht('Cancel Event'); $cancel_label = pht('Cancel Event');