@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
Adds details to Calendar event feed titles
Summary: Closes T8340
Test Plan: Verify that calendar event feed titles have more detail that before.
Reviewers: lpriestley, #blessed_reviewers, epriestley
Reviewed By: lpriestley, #blessed_reviewers, epriestley
Subscribers: epriestley, Korvin
Maniphest Tasks: T8340
Differential Revision: https://secure.phabricator.com/D13352
authored by
Paul Kassianik
and committed by
epriestley
b1f64d93
b22fba1a
+71
-6
+4
-4
src/applications/calendar/controller/PhabricatorCalendarEventEditController.php
+4
-4
src/applications/calendar/controller/PhabricatorCalendarEventEditController.php
···
341
341
$recurrence_frequency_select = id(new AphrontFormSelectControl())
342
342
->setName('frequency')
343
343
->setOptions(array(
344
-
'daily' => pht('Daily'),
345
-
'weekly' => pht('Weekly'),
346
-
'monthly' => pht('Monthly'),
347
-
'yearly' => pht('Yearly'),
344
+
PhabricatorCalendarEvent::FREQUENCY_DAILY => pht('Daily'),
345
+
PhabricatorCalendarEvent::FREQUENCY_WEEKLY => pht('Weekly'),
346
+
PhabricatorCalendarEvent::FREQUENCY_MONTHLY => pht('Monthly'),
347
+
PhabricatorCalendarEvent::FREQUENCY_YEARLY => pht('Yearly'),
348
348
))
349
349
->setValue($frequency)
350
350
->setLabel(pht('Recurring Event Frequency'))
+6
src/applications/calendar/storage/PhabricatorCalendarEvent.php
+6
src/applications/calendar/storage/PhabricatorCalendarEvent.php
···
37
37
private $invitees = self::ATTACHABLE;
38
38
private $appliedViewer;
39
39
40
+
// Frequency Constants
41
+
const FREQUENCY_DAILY = 'daily';
42
+
const FREQUENCY_WEEKLY = 'weekly';
43
+
const FREQUENCY_MONTHLY = 'monthly';
44
+
const FREQUENCY_YEARLY = 'yearly';
45
+
40
46
public static function initializeNewCalendarEvent(
41
47
PhabricatorUser $actor,
42
48
$mode) {
+61
-2
src/applications/calendar/storage/PhabricatorCalendarEventTransaction.php
+61
-2
src/applications/calendar/storage/PhabricatorCalendarEventTransaction.php
···
254
254
}
255
255
return $text;
256
256
case self::TYPE_RECURRING:
257
+
$text = pht('%s made this event recurring.',
258
+
$this->renderHandleLink($author_phid));
259
+
return $text;
257
260
case self::TYPE_FREQUENCY:
261
+
$text = '';
262
+
switch ($new['rule']) {
263
+
case PhabricatorCalendarEvent::FREQUENCY_DAILY:
264
+
$text = pht('%s set this event to repeat daily.',
265
+
$this->renderHandleLink($author_phid));
266
+
break;
267
+
case PhabricatorCalendarEvent::FREQUENCY_WEEKLY:
268
+
$text = pht('%s set this event to repeat weekly.',
269
+
$this->renderHandleLink($author_phid));
270
+
break;
271
+
case PhabricatorCalendarEvent::FREQUENCY_MONTHLY:
272
+
$text = pht('%s set this event to repeat monthly.',
273
+
$this->renderHandleLink($author_phid));
274
+
break;
275
+
case PhabricatorCalendarEvent::FREQUENCY_YEARLY:
276
+
$text = pht('%s set this event to repeat yearly.',
277
+
$this->renderHandleLink($author_phid));
278
+
break;
279
+
}
280
+
return $text;
258
281
case self::TYPE_RECURRENCE_END_DATE:
282
+
$text = pht('%s has changed the recurrence end date of this event.',
283
+
$this->renderHandleLink($author_phid));
284
+
return $text;
259
285
case self::TYPE_INSTANCE_OF_EVENT:
260
286
case self::TYPE_SEQUENCE_INDEX:
261
-
return pht('Recurring event has been updated');
287
+
return pht('Recurring event has been updated.');
262
288
}
263
289
return parent::getTitle();
264
290
}
···
438
464
}
439
465
return $text;
440
466
case self::TYPE_RECURRING:
467
+
$text = pht('%s made %s a recurring event.',
468
+
$this->renderHandleLink($author_phid),
469
+
$this->renderHandleLink($object_phid));
470
+
return $text;
441
471
case self::TYPE_FREQUENCY:
472
+
$text = '';
473
+
switch ($new['rule']) {
474
+
case PhabricatorCalendarEvent::FREQUENCY_DAILY:
475
+
$text = pht('%s set %s to repeat daily.',
476
+
$this->renderHandleLink($author_phid),
477
+
$this->renderHandleLink($object_phid));
478
+
break;
479
+
case PhabricatorCalendarEvent::FREQUENCY_WEEKLY:
480
+
$text = pht('%s set %s to repeat weekly.',
481
+
$this->renderHandleLink($author_phid),
482
+
$this->renderHandleLink($object_phid));
483
+
break;
484
+
case PhabricatorCalendarEvent::FREQUENCY_MONTHLY:
485
+
$text = pht('%s set %s to repeat monthly.',
486
+
$this->renderHandleLink($author_phid),
487
+
$this->renderHandleLink($object_phid));
488
+
break;
489
+
case PhabricatorCalendarEvent::FREQUENCY_YEARLY:
490
+
$text = pht('%s set %s to repeat yearly.',
491
+
$this->renderHandleLink($author_phid),
492
+
$this->renderHandleLink($object_phid));
493
+
break;
494
+
}
495
+
return $text;
442
496
case self::TYPE_RECURRENCE_END_DATE:
497
+
$text = pht('%s set the recurrence end date of %s to %s.',
498
+
$this->renderHandleLink($author_phid),
499
+
$this->renderHandleLink($object_phid),
500
+
$new);
501
+
return $text;
443
502
case self::TYPE_INSTANCE_OF_EVENT:
444
503
case self::TYPE_SEQUENCE_INDEX:
445
-
return pht('Recurring event has been updated');
504
+
return pht('Recurring event has been updated.');
446
505
}
447
506
448
507
return parent::getTitleForFeed();