Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Wurst <christoph@winzerhof-wurst.at>2021-10-13 12:02:26 +0300
committerChristoph Wurst <christoph@winzerhof-wurst.at>2021-10-13 21:33:29 +0300
commit2148c448cc0f5ab891e649b0a2a4d32f1075012a (patch)
treedb10150894349c6ed8c97e3833052093ad37553b
parentc6166c0a374257b785b90ccb15c90ee30e9ce192 (diff)
Fix default language detection for calendar notifications
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
-rw-r--r--apps/dav/lib/CalDAV/Reminder/NotificationProvider/AbstractProvider.php2
-rw-r--r--apps/dav/tests/unit/CalDAV/Reminder/NotificationProvider/EmailProviderTest.php4
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