summaryrefslogtreecommitdiffstats
path: root/apps/files_sharing
diff options
context:
space:
mode:
authorJoas Schilling <213943+nickvergessen@users.noreply.github.com>2022-06-10 15:54:14 +0200
committerGitHub <noreply@github.com>2022-06-10 15:54:14 +0200
commit148498bba574587d66bc18c0f1685ec5e332f3ba (patch)
treea31fc8e5425a8ba29d462ab6a7d021e19f7575f5 /apps/files_sharing
parent6ee4e0b94c15a784e8a22ee790664f0d21caa02b (diff)
parent50c697dbd4a8f8ab2f372944c0a55ad89f201f40 (diff)
downloadnextcloud-server-148498bba574587d66bc18c0f1685ec5e332f3ba.tar.gz
nextcloud-server-148498bba574587d66bc18c0f1685ec5e332f3ba.zip
Merge pull request #32741 from nextcloud/Valdnet-patch-2
l10n: Delete apostrophe
Diffstat (limited to 'apps/files_sharing')
-rw-r--r--apps/files_sharing/lib/Controller/RemoteController.php4
-rw-r--r--apps/files_sharing/lib/Controller/ShareAPIController.php16
-rw-r--r--apps/files_sharing/templates/part.404.php2
-rw-r--r--apps/files_sharing/tests/ApiTest.php2
-rw-r--r--apps/files_sharing/tests/Controller/ShareAPIControllerTest.php10
5 files changed, 17 insertions, 17 deletions
diff --git a/apps/files_sharing/lib/Controller/RemoteController.php b/apps/files_sharing/lib/Controller/RemoteController.php
index 75684220c52..47523e08639 100644
--- a/apps/files_sharing/lib/Controller/RemoteController.php
+++ b/apps/files_sharing/lib/Controller/RemoteController.php
@@ -86,7 +86,7 @@ class RemoteController extends OCSController {
$this->logger->error('Could not accept federated share with id: ' . $id,
['app' => 'files_sharing']);
- throw new OCSNotFoundException('wrong share ID, share doesn\'t exist.');
+ throw new OCSNotFoundException('wrong share ID, share does not exist.');
}
/**
@@ -106,7 +106,7 @@ class RemoteController extends OCSController {
// Make sure the user has no notification for something that does not exist anymore.
$this->externalManager->processNotification($id);
- throw new OCSNotFoundException('wrong share ID, share doesn\'t exist.');
+ throw new OCSNotFoundException('wrong share ID, share does not exist.');
}
/**
diff --git a/apps/files_sharing/lib/Controller/ShareAPIController.php b/apps/files_sharing/lib/Controller/ShareAPIController.php
index f531954d5da..fafdb1a64cd 100644
--- a/apps/files_sharing/lib/Controller/ShareAPIController.php
+++ b/apps/files_sharing/lib/Controller/ShareAPIController.php
@@ -366,7 +366,7 @@ class ShareAPIController extends OCSController {
try {
$share = $this->getShareById($id);
} catch (ShareNotFound $e) {
- throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
+ throw new OCSNotFoundException($this->l->t('Wrong share ID, share does not exist'));
}
try {
@@ -378,7 +378,7 @@ class ShareAPIController extends OCSController {
// Fall trough
}
- throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
+ throw new OCSNotFoundException($this->l->t('Wrong share ID, share does not exist'));
}
/**
@@ -394,7 +394,7 @@ class ShareAPIController extends OCSController {
try {
$share = $this->getShareById($id);
} catch (ShareNotFound $e) {
- throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
+ throw new OCSNotFoundException($this->l->t('Wrong share ID, share does not exist'));
}
try {
@@ -404,7 +404,7 @@ class ShareAPIController extends OCSController {
}
if (!$this->canAccessShare($share)) {
- throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
+ throw new OCSNotFoundException($this->l->t('Wrong share ID, share does not exist'));
}
// if it's a group share or a room share
@@ -1056,13 +1056,13 @@ class ShareAPIController extends OCSController {
try {
$share = $this->getShareById($id);
} catch (ShareNotFound $e) {
- throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
+ throw new OCSNotFoundException($this->l->t('Wrong share ID, share does not exist'));
}
$this->lock($share->getNode());
if (!$this->canAccessShare($share, false)) {
- throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
+ throw new OCSNotFoundException($this->l->t('Wrong share ID, share does not exist'));
}
if (!$this->canEditShare($share)) {
@@ -1291,11 +1291,11 @@ class ShareAPIController extends OCSController {
try {
$share = $this->getShareById($id);
} catch (ShareNotFound $e) {
- throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
+ throw new OCSNotFoundException($this->l->t('Wrong share ID, share does not exist'));
}
if (!$this->canAccessShare($share)) {
- throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
+ throw new OCSNotFoundException($this->l->t('Wrong share ID, share does not exist'));
}
try {
diff --git a/apps/files_sharing/templates/part.404.php b/apps/files_sharing/templates/part.404.php
index 3ef117d7524..2aa55383847 100644
--- a/apps/files_sharing/templates/part.404.php
+++ b/apps/files_sharing/templates/part.404.php
@@ -1,6 +1,6 @@
<ul>
<li class="error error-broken-link">
- <p><?php p($l->t('Sorry, this link doesn’t seem to work anymore.')) ?></p>
+ <p><?php p($l->t('Sorry, this link does not seem to work anymore.')) ?></p>
<p><?php p($l->t('Reasons might be:')); ?></p>
<ul>
<li><?php p($l->t('the item was removed')); ?></li>
diff --git a/apps/files_sharing/tests/ApiTest.php b/apps/files_sharing/tests/ApiTest.php
index c7159e82163..a16a1aaf383 100644
--- a/apps/files_sharing/tests/ApiTest.php
+++ b/apps/files_sharing/tests/ApiTest.php
@@ -929,7 +929,7 @@ class ApiTest extends TestCase {
$ocs->getShare(0);
$this->fail();
} catch (OCSNotFoundException $e) {
- $this->assertEquals('Wrong share ID, share doesn\'t exist', $e->getMessage());
+ $this->assertEquals('Wrong share ID, share does not exist', $e->getMessage());
}
$ocs->cleanup();
}
diff --git a/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php b/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php
index 5555aef1425..fd5580f19a7 100644
--- a/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php
+++ b/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php
@@ -196,7 +196,7 @@ class ShareAPIControllerTest extends TestCase {
public function testDeleteShareShareNotFound() {
$this->expectException(\OCP\AppFramework\OCS\OCSNotFoundException::class);
- $this->expectExceptionMessage('Wrong share ID, share doesn\'t exist');
+ $this->expectExceptionMessage('Wrong share ID, share does not exist');
$this->shareManager
->expects($this->exactly(6))
@@ -433,7 +433,7 @@ class ShareAPIControllerTest extends TestCase {
*/
public function testDeleteSharedWithGroupIDontBelongTo() {
$this->expectException(\OCP\AppFramework\OCS\OCSNotFoundException::class);
- $this->expectExceptionMessage('Wrong share ID, share doesn\'t exist');
+ $this->expectExceptionMessage('Wrong share ID, share does not exist');
$node = $this->getMockBuilder(File::class)->getMock();
@@ -498,7 +498,7 @@ class ShareAPIControllerTest extends TestCase {
->with('ocinternal:42', 'currentUser')
->will($this->throwException(new \OC\Share20\Exception\ShareNotFound()));
- $expected = new \OC\OCS\Result(null, 404, 'wrong share ID, share doesn\'t exist.');
+ $expected = new \OC\OCS\Result(null, 404, 'wrong share ID, share does not exist.');
$this->assertEquals($expected, $this->ocs->getShare(42));
}
*/
@@ -808,7 +808,7 @@ class ShareAPIControllerTest extends TestCase {
public function testGetShareInvalidNode() {
$this->expectException(\OCP\AppFramework\OCS\OCSNotFoundException::class);
- $this->expectExceptionMessage('Wrong share ID, share doesn\'t exist');
+ $this->expectExceptionMessage('Wrong share ID, share does not exist');
$share = \OC::$server->getShareManager()->newShare();
$share->setSharedBy('initiator')
@@ -2602,7 +2602,7 @@ class ShareAPIControllerTest extends TestCase {
public function testUpdateShareCantAccess() {
$this->expectException(\OCP\AppFramework\OCS\OCSNotFoundException::class);
- $this->expectExceptionMessage('Wrong share ID, share doesn\'t exist');
+ $this->expectExceptionMessage('Wrong share ID, share does not exist');
$node = $this->getMockBuilder(Folder::class)->getMock();
$share = $this->newShare();