sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #29195 from nextcloud/fix/calendar-invitations-default-language 

Fix default language detection for calendar emails
pull/29235/head
Daniel 2021-10-14 09:24:59 +07:00 committed by GitHub
parent 7129a51a95 2148c448cc
commit abc2472c5d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/dav/lib/CalDAV/Reminder/NotificationProvider/AbstractProvider.php
Unescape Escape View File

@ -104,7 +104,7 @@ abstract class AbstractProvider implements INotificationProvider {
return $this->fallbackLanguage;
}
$fallbackLanguage = $this->l10nFactory->findLanguage();
$fallbackLanguage = $this->l10nFactory->findGenericLanguage();
$this->fallbackLanguage = $fallbackLanguage;
return $fallbackLanguage;

2
apps/dav/lib/CalDAV/Schedule/IMipPlugin.php
Unescape Escape View File

@ -202,7 +202,7 @@ class IMipPlugin extends SabreIMipPlugin {
$vevent = $iTipMessage->message->VEVENT;
$attendee = $this->getCurrentAttendee($iTipMessage);
$defaultLang = $this->l10nFactory->findLanguage();
$defaultLang = $this->l10nFactory->findGenericLanguage();
$lang = $this->getAttendeeLangOrDefault($defaultLang, $attendee);
$l10n = $this->l10nFactory->get('dav', $lang);

4
apps/dav/tests/unit/CalDAV/Reminder/NotificationProvider/EmailProviderTest.php
Unescape Escape View File

@ -104,7 +104,7 @@ class EmailProviderTest extends AbstractNotificationProviderTest {
]);
$this->l10nFactory
->method('findLanguage')
->method('findGenericLanguage')
->willReturn('en');
$this->l10nFactory
@ -214,7 +214,7 @@ class EmailProviderTest extends AbstractNotificationProviderTest {
]);
$this->l10nFactory
->method('findLanguage')
->method('findGenericLanguage')
->willReturn('en');
$this->l10nFactory