Skip to content

Commit

Permalink
feat(dav): Add from name in reminder mail and localize subject
Browse files Browse the repository at this point in the history
Signed-off-by: Matthias Meusburger <matthias.meusburger@gmx.at>
  • Loading branch information
matthias480 committed Feb 21, 2025
1 parent 1cbd474 commit 1e4ec54
Showing 1 changed file with 7 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
namespace OCA\DAV\CalDAV\Reminder\NotificationProvider;

use DateTime;
use OCP\Defaults;
use OCP\IConfig;
use OCP\IL10N;
use OCP\IURLGenerator;
Expand Down Expand Up @@ -82,12 +83,15 @@ public function send(VEvent $vevent,
$sortedByLanguage = $this->sortEMailAddressesByLanguage($emailAddresses, $fallbackLanguage);
$organizer = $this->getOrganizerEMailAndNameFromEvent($vevent);

$fromEMail = Util::getDefaultEmailAddress('reminders-noreply');
$defaults = new Defaults();
$fromName = $defaults->getName();

foreach ($sortedByLanguage as $lang => $emailAddresses) {
if (!$this->hasL10NForLang($lang)) {
$lang = $fallbackLanguage;
}
$l10n = $this->getL10NForLang($lang);
$fromEMail = Util::getDefaultEmailAddress('reminders-noreply');

$template = $this->mailer->createEMailTemplate('dav.calendarReminder');
$template->addHeader();
Expand All @@ -102,7 +106,7 @@ public function send(VEvent $vevent,
}

$message = $this->mailer->createMessage();
$message->setFrom([$fromEMail]);
$message->setFrom([$fromEMail => $fromName]);
if ($organizer) {
$message->setReplyTo($organizer);
}
Expand All @@ -128,7 +132,7 @@ public function send(VEvent $vevent,
* @param VEvent $vevent
*/
private function addSubjectAndHeading(IEMailTemplate $template, IL10N $l10n, VEvent $vevent):void {
$template->setSubject('Notification: ' . $this->getTitleFromVEvent($vevent, $l10n));
$template->setSubject($l10n->t('Notification: %s', [$this->getTitleFromVEvent($vevent, $l10n)]));
$template->addHeading($this->getTitleFromVEvent($vevent, $l10n));
}

Expand Down

0 comments on commit 1e4ec54

Please sign in to comment.