From 625ac39529c10344a3d6db3d10204970df242beb Mon Sep 17 00:00:00 2001 From: whoalin1 Date: Wed, 7 Oct 2026 02:46:47 +0300 Subject: [PATCH] fix(dav): drop redundant event word so merged CalDAV activities read correctly Assisted-by: Cursor:grok-4.7 Signed-off-by: whoalin1 --- .../lib/CalDAV/Activity/Provider/Event.php | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/apps/dav/lib/CalDAV/Activity/Provider/Event.php b/apps/dav/lib/CalDAV/Activity/Provider/Event.php index 93e7ed889ffb8..ce04a2f0ebd13 100644 --- a/apps/dav/lib/CalDAV/Activity/Provider/Event.php +++ b/apps/dav/lib/CalDAV/Activity/Provider/Event.php @@ -113,29 +113,29 @@ public function parse($language, IEvent $event, ?IEvent $previousEvent = null) { } if ($event->getSubject() === self::SUBJECT_OBJECT_ADD . '_event') { - $subject = $this->l->t('{actor} created event {event} in calendar {calendar}'); + $subject = $this->l->t('{actor} created {event} in calendar {calendar}'); } elseif ($event->getSubject() === self::SUBJECT_OBJECT_ADD . '_event_self') { - $subject = $this->l->t('You created event {event} in calendar {calendar}'); + $subject = $this->l->t('You created {event} in calendar {calendar}'); } elseif ($event->getSubject() === self::SUBJECT_OBJECT_DELETE . '_event') { - $subject = $this->l->t('{actor} deleted event {event} from calendar {calendar}'); + $subject = $this->l->t('{actor} deleted {event} from calendar {calendar}'); } elseif ($event->getSubject() === self::SUBJECT_OBJECT_DELETE . '_event_self') { - $subject = $this->l->t('You deleted event {event} from calendar {calendar}'); + $subject = $this->l->t('You deleted {event} from calendar {calendar}'); } elseif ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_event') { - $subject = $this->l->t('{actor} updated event {event} in calendar {calendar}'); + $subject = $this->l->t('{actor} updated {event} in calendar {calendar}'); } elseif ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_event_self') { - $subject = $this->l->t('You updated event {event} in calendar {calendar}'); + $subject = $this->l->t('You updated {event} in calendar {calendar}'); } elseif ($event->getSubject() === self::SUBJECT_OBJECT_MOVE . '_event') { - $subject = $this->l->t('{actor} moved event {event} from calendar {sourceCalendar} to calendar {targetCalendar}'); + $subject = $this->l->t('{actor} moved {event} from calendar {sourceCalendar} to calendar {targetCalendar}'); } elseif ($event->getSubject() === self::SUBJECT_OBJECT_MOVE . '_event_self') { - $subject = $this->l->t('You moved event {event} from calendar {sourceCalendar} to calendar {targetCalendar}'); + $subject = $this->l->t('You moved {event} from calendar {sourceCalendar} to calendar {targetCalendar}'); } elseif ($event->getSubject() === self::SUBJECT_OBJECT_MOVE_TO_TRASH . '_event') { - $subject = $this->l->t('{actor} deleted event {event} from calendar {calendar}'); + $subject = $this->l->t('{actor} deleted {event} from calendar {calendar}'); } elseif ($event->getSubject() === self::SUBJECT_OBJECT_MOVE_TO_TRASH . '_event_self') { - $subject = $this->l->t('You deleted event {event} from calendar {calendar}'); + $subject = $this->l->t('You deleted {event} from calendar {calendar}'); } elseif ($event->getSubject() === self::SUBJECT_OBJECT_RESTORE . '_event') { - $subject = $this->l->t('{actor} restored event {event} of calendar {calendar}'); + $subject = $this->l->t('{actor} restored {event} of calendar {calendar}'); } elseif ($event->getSubject() === self::SUBJECT_OBJECT_RESTORE . '_event_self') { - $subject = $this->l->t('You restored event {event} of calendar {calendar}'); + $subject = $this->l->t('You restored {event} of calendar {calendar}'); } else { throw new UnknownActivityException(); }