aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2021-04-12 08:35:50 +0200
committerGitHub <noreply@github.com>2021-04-12 08:35:50 +0200
commitb07a8fd1fe2f18e64f2ff5b8e2c7187a7b61b9ec (patch)
treedace67f495345d1386d03c2544b187a9db860db6
parentac893e843b64b00ad83ce08e88534fc7c4d3f464 (diff)
parent6da17a6fab438588b1838c0eef783e988edacf64 (diff)
downloadnextcloud-server-b07a8fd1fe2f18e64f2ff5b8e2c7187a7b61b9ec.tar.gz
nextcloud-server-b07a8fd1fe2f18e64f2ff5b8e2c7187a7b61b9ec.zip
Merge pull request #26230 from nextcloud/Valdnet-patch-4
l10n: Add word user in FederatedShareProvider.php
-rw-r--r--apps/federatedfilesharing/lib/FederatedShareProvider.php2
-rw-r--r--apps/federatedfilesharing/tests/FederatedShareProviderTest.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/federatedfilesharing/lib/FederatedShareProvider.php b/apps/federatedfilesharing/lib/FederatedShareProvider.php
index cd0ad49b6a5..47d0d84fb4c 100644
--- a/apps/federatedfilesharing/lib/FederatedShareProvider.php
+++ b/apps/federatedfilesharing/lib/FederatedShareProvider.php
@@ -190,7 +190,7 @@ class FederatedShareProvider implements IShareProvider {
$alreadySharedGroup = $this->getSharedWith($shareWith, IShare::TYPE_REMOTE_GROUP, $share->getNode(), 1, 0);
if (!empty($alreadyShared) || !empty($alreadySharedGroup)) {
$message = 'Sharing %1$s failed, because this item is already shared with %2$s';
- $message_t = $this->l->t('Sharing %1$s failed, because this item is already shared with %2$s', [$share->getNode()->getName(), $shareWith]);
+ $message_t = $this->l->t('Sharing %1$s failed, because this item is already shared with user %2$s', [$share->getNode()->getName(), $shareWith]);
$this->logger->debug(sprintf($message, $share->getNode()->getName(), $shareWith), ['app' => 'Federated File Sharing']);
throw new \Exception($message_t);
}
diff --git a/apps/federatedfilesharing/tests/FederatedShareProviderTest.php b/apps/federatedfilesharing/tests/FederatedShareProviderTest.php
index 50d861cc5d7..45a2b158a64 100644
--- a/apps/federatedfilesharing/tests/FederatedShareProviderTest.php
+++ b/apps/federatedfilesharing/tests/FederatedShareProviderTest.php
@@ -437,7 +437,7 @@ class FederatedShareProviderTest extends \Test\TestCase {
try {
$this->provider->create($share);
} catch (\Exception $e) {
- $this->assertEquals('Sharing myFile failed, because this item is already shared with user@server.com', $e->getMessage());
+ $this->assertEquals('Sharing myFile failed, because this item is already shared with user user@server.com', $e->getMessage());
}
}