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:
authorValdnet <47037905+Valdnet@users.noreply.github.com>2021-05-20 12:27:24 +0300
committerGitHub <noreply@github.com>2021-05-20 12:27:24 +0300
commit7ffee26aa8768736593c77dcb12d17978a6e06b2 (patch)
treef570754f02d47e081d61a9f0bf783ebd8d7cc780 /apps/encryption
parent5432c958be918bece086ccf32ffd86f68bbda675 (diff)
parentdc981623aa040c7e16dfcff16916a7706c689750 (diff)
Merge pull request #26511 from nextcloud/Valdnet-patch-4
l10n: Unify spelling
Diffstat (limited to 'apps/encryption')
-rw-r--r--apps/encryption/lib/Crypto/Encryption.php6
-rw-r--r--apps/encryption/tests/Crypto/EncryptionTest.php2
2 files changed, 4 insertions, 4 deletions
diff --git a/apps/encryption/lib/Crypto/Encryption.php b/apps/encryption/lib/Crypto/Encryption.php
index 51c5122eb93..9f3cc964e40 100644
--- a/apps/encryption/lib/Crypto/Encryption.php
+++ b/apps/encryption/lib/Crypto/Encryption.php
@@ -366,8 +366,8 @@ class Encryption implements IEncryptionModule {
*/
public function decrypt($data, $position = 0) {
if (empty($this->fileKey)) {
- $msg = 'Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you.';
- $hint = $this->l->t('Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you.');
+ $msg = 'Cannot decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you.';
+ $hint = $this->l->t('Cannot decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you.');
$this->logger->error($msg);
throw new DecryptionFailedException($msg, $hint);
@@ -492,7 +492,7 @@ class Encryption implements IEncryptionModule {
// valid private/public key
$msg = 'Encryption module "' . $this->getDisplayName() .
'" is not able to read ' . $path;
- $hint = $this->l->t('Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you.');
+ $hint = $this->l->t('Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you.');
$this->logger->warning($msg);
throw new DecryptionFailedException($msg, $hint);
}
diff --git a/apps/encryption/tests/Crypto/EncryptionTest.php b/apps/encryption/tests/Crypto/EncryptionTest.php
index c14ee22e879..b052dca2387 100644
--- a/apps/encryption/tests/Crypto/EncryptionTest.php
+++ b/apps/encryption/tests/Crypto/EncryptionTest.php
@@ -431,7 +431,7 @@ class EncryptionTest extends TestCase {
public function testDecrypt() {
$this->expectException(\OC\Encryption\Exceptions\DecryptionFailedException::class);
- $this->expectExceptionMessage('Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you.');
+ $this->expectExceptionMessage('Cannot decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you.');
$this->instance->decrypt('abc');
}