Fixes #37039 - use default_language as default

changelog/unreleased/37039

@@ -0,0 +1,3 @@
+Change: Respect default_language when sending email notifications
+
+https://github.com/owncloud/core/issues/37039

lib/private/Share/MailNotifications.php

@@ -165,7 +165,8 @@ public function sendInternalShareMail($sender, $node, $shareType, $recipientList
 			$unescapedFilename = $filename;
 			$link = $filter->getLink();
 
-			$recipientLanguageCode = $this->config->getUserValue($recipient->getUID(), 'core', 'lang', 'en');
+			$defaultLang = $this->config->getSystemValue('default_language', 'en');
+			$recipientLanguageCode = $this->config->getUserValue($recipient->getUID(), 'core', 'lang', $defaultLang);
 			$recipientL10N = \OC::$server->getL10N('lib');
 			if ($this->l->getLanguageCode() !== $recipientLanguageCode) {
 				$recipientL10N = \OC::$server->getL10N('lib', $recipientLanguageCode);

tests/lib/Share/MailNotificationsTest.php

@@ -563,23 +563,27 @@ protected function getShareMock(array $shareData) {
 		return $share;
 	}
 
-	public function providesLanguages() {
+	public function providesLanguages(): array {
 		return [
-			['es', 'en'],
-			['en', 'en']
+			['es', 'en', 'TestUser ha compartido »<welcome>.txt« contigo'],
+			['en', 'en', 'TestUser shared »<welcome>.txt« with you']
 		];
 	}
+
 	/**
 	 * @dataProvider providesLanguages
 	 * @param string $recipientLanguage
 	 * @param string $senderLanguage
+	 * @param string $expectedSubject
+	 * @throws \OCP\Files\NotFoundException
+	 * @throws \OCP\Share\Exceptions\GenericShareException
 	 */
-	public function testSendInternalShareWithRecipientLanguageCode($recipientLanguage, $senderLanguage) {
+	public function testSendInternalShareWithRecipientLanguageCode($recipientLanguage, $senderLanguage, $expectedSubject) {
 		$this->config
 			->method('getAppValue')
 			->with('core', 'shareapi_allow_mail_notification', 'no')
 			->willReturn('yes');
-		$this->setupMailerMock('TestUser shared »<welcome>.txt« with you', false);
+		$this->setupMailerMock($expectedSubject, false);
 		$shareMock = $this->getShareMock(
 			['file_target' => '/<welcome>.txt', 'item_source' => 123, 'expiration' => '2017-01-01T15:03:01.012345Z']
 		);
@@ -595,6 +599,10 @@ public function testSendInternalShareWithRecipientLanguageCode($recipientLanguag
 			->willReturn('Recipient');
 		$recipient->method('getUID')
 			->willReturn('Recipient');
+		$this->config->expects($this->once())
+			->method('getSystemValue')
+			->with('default_language', 'en')
+			->willReturn('en');
 		$this->config->expects($this->once())
 			->method('getUserValue')
 			->with('Recipient', 'core', 'lang', 'en')