From 2148c448cc0f5ab891e649b0a2a4d32f1075012a Mon Sep 17 00:00:00 2001 From: Christoph Wurst Date: Wed, 13 Oct 2021 11:02:26 +0200 Subject: [PATCH] Fix default language detection for calendar notifications Signed-off-by: Christoph Wurst --- .../CalDAV/Reminder/NotificationProvider/AbstractProvider.php | 2 +- .../Reminder/NotificationProvider/EmailProviderTest.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/dav/lib/CalDAV/Reminder/NotificationProvider/AbstractProvider.php b/apps/dav/lib/CalDAV/Reminder/NotificationProvider/AbstractProvider.php index 8df6ef06fa5..044e5fac4e2 100644 --- a/apps/dav/lib/CalDAV/Reminder/NotificationProvider/AbstractProvider.php +++ b/apps/dav/lib/CalDAV/Reminder/NotificationProvider/AbstractProvider.php @@ -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; diff --git a/apps/dav/tests/unit/CalDAV/Reminder/NotificationProvider/EmailProviderTest.php b/apps/dav/tests/unit/CalDAV/Reminder/NotificationProvider/EmailProviderTest.php index 9e96a1f3bec..0352827aa5c 100644 --- a/apps/dav/tests/unit/CalDAV/Reminder/NotificationProvider/EmailProviderTest.php +++ b/apps/dav/tests/unit/CalDAV/Reminder/NotificationProvider/EmailProviderTest.php @@ -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