99namespace OCA \DAV \CalDAV \Reminder \NotificationProvider ;
1010
1111use DateTime ;
12+ use OCP \Defaults ;
1213use OCP \IConfig ;
1314use OCP \IL10N ;
1415use OCP \IURLGenerator ;
@@ -82,12 +83,15 @@ public function send(VEvent $vevent,
8283 $ sortedByLanguage = $ this ->sortEMailAddressesByLanguage ($ emailAddresses , $ fallbackLanguage );
8384 $ organizer = $ this ->getOrganizerEMailAndNameFromEvent ($ vevent );
8485
86+ $ fromEMail = Util::getDefaultEmailAddress ('reminders-noreply ' );
87+ $ defaults = new Defaults ();
88+ $ fromName = $ defaults ->getName ();
89+
8590 foreach ($ sortedByLanguage as $ lang => $ emailAddresses ) {
8691 if (!$ this ->hasL10NForLang ($ lang )) {
8792 $ lang = $ fallbackLanguage ;
8893 }
8994 $ l10n = $ this ->getL10NForLang ($ lang );
90- $ fromEMail = Util::getDefaultEmailAddress ('reminders-noreply ' );
9195
9296 $ template = $ this ->mailer ->createEMailTemplate ('dav.calendarReminder ' );
9397 $ template ->addHeader ();
@@ -102,7 +106,7 @@ public function send(VEvent $vevent,
102106 }
103107
104108 $ message = $ this ->mailer ->createMessage ();
105- $ message ->setFrom ([$ fromEMail ]);
109+ $ message ->setFrom ([$ fromEMail => $ fromName ]);
106110 if ($ organizer ) {
107111 $ message ->setReplyTo ($ organizer );
108112 }
@@ -128,7 +132,7 @@ public function send(VEvent $vevent,
128132 * @param VEvent $vevent
129133 */
130134 private function addSubjectAndHeading (IEMailTemplate $ template , IL10N $ l10n , VEvent $ vevent ):void {
131- $ template ->setSubject ('Notification: ' . $ this ->getTitleFromVEvent ($ vevent , $ l10n ));
135+ $ template ->setSubject ($ l10n -> t ( 'Notification: %s ' , [ $ this ->getTitleFromVEvent ($ vevent , $ l10n)] ));
132136 $ template ->addHeading ($ this ->getTitleFromVEvent ($ vevent , $ l10n ));
133137 }
134138
0 commit comments