diff options
| author | rakekniven <2069590+rakekniven@users.noreply.github.com> | 2021-07-08 18:14:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-08 18:14:59 +0200 |
| commit | dad31ce3fa7085769b87309141c250c5865994b4 (patch) | |
| tree | cf38218beee95bc1fdede7bcfdff5f5a5ed33aa8 /apps | |
| parent | 27fb46c77daf97e43252cab906acd6cfd194a607 (diff) | |
| parent | 0c27faf7113d2c4cecfd94e0c02a31032a22b9fa (diff) | |
| download | nextcloud-server-dad31ce3fa7085769b87309141c250c5865994b4.tar.gz nextcloud-server-dad31ce3fa7085769b87309141c250c5865994b4.zip | |
Merge pull request #27847 from nextcloud/enh/26973/talk-password-failed
Update "Sending password by Nextcloud Talk failed" sentence
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files_sharing/lib/Controller/ShareAPIController.php | 2 | ||||
| -rw-r--r-- | apps/files_sharing/tests/Controller/ShareAPIControllerTest.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/files_sharing/lib/Controller/ShareAPIController.php b/apps/files_sharing/lib/Controller/ShareAPIController.php index b323e5514a5..668bbb7cca8 100644 --- a/apps/files_sharing/lib/Controller/ShareAPIController.php +++ b/apps/files_sharing/lib/Controller/ShareAPIController.php @@ -1161,7 +1161,7 @@ class ShareAPIController extends OCSController { if ($sendPasswordByTalk === 'true') { if (!$this->appManager->isEnabledForUser('spreed')) { - throw new OCSForbiddenException($this->l->t('Sharing sending the password by Nextcloud Talk failed because Nextcloud Talk is not enabled')); + throw new OCSForbiddenException($this->l->t('"Sending the password by Nextcloud Talk" for sharing a file or folder failed because Nextcloud Talk is not enabled.')); } $share->setSendPasswordByTalk(true); diff --git a/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php b/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php index eff2d529a05..411496f7a27 100644 --- a/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php +++ b/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php @@ -2967,7 +2967,7 @@ class ShareAPIControllerTest extends TestCase { public function testUpdateLinkShareSendPasswordByTalkWithTalkDisabledDoesNotChangeOther() { $this->expectException(\OCP\AppFramework\OCS\OCSForbiddenException::class); - $this->expectExceptionMessage('Sharing sending the password by Nextcloud Talk failed because Nextcloud Talk is not enabled'); + $this->expectExceptionMessage('"Sending the password by Nextcloud Talk" for sharing a file or folder failed because Nextcloud Talk is not enabled.'); $ocs = $this->mockFormatShare(); |