Skip to content

Commit 14e0e48

Browse files
Merge pull request #47084 from nextcloud/backport/47070/stable29
[stable29] fix(share): Rename Circle to Team
2 parents 3cd47a4 + cdf29e6 commit 14e0e48

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

apps/files_sharing/lib/Controller/ShareAPIController.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ protected function formatShare(IShare $share, ?Node $recipientNode = null): arra
260260
$result['token'] = $share->getToken();
261261
} elseif ($share->getShareType() === IShare::TYPE_CIRCLE) {
262262
// getSharedWith() returns either "name (type, owner)" or
263-
// "name (type, owner) [id]", depending on the Circles app version.
263+
// "name (type, owner) [id]", depending on the Teams app version.
264264
$hasCircleId = (substr($share->getSharedWith(), -1) === ']');
265265

266266
$result['share_with_displayname'] = $share->getSharedWithDisplayName();
@@ -762,14 +762,14 @@ public function createShare(
762762
$share->setPermissions($permissions);
763763
} elseif ($shareType === IShare::TYPE_CIRCLE) {
764764
if (!\OC::$server->getAppManager()->isEnabledForUser('circles') || !class_exists('\OCA\Circles\ShareByCircleProvider')) {
765-
throw new OCSNotFoundException($this->l->t('You cannot share to a Circle if the app is not enabled'));
765+
throw new OCSNotFoundException($this->l->t('You cannot share to a Team if the app is not enabled'));
766766
}
767767

768768
$circle = \OCA\Circles\Api\v1\Circles::detailsCircle($shareWith);
769769

770-
// Valid circle is required to share
770+
// Valid team is required to share
771771
if ($circle === null) {
772-
throw new OCSNotFoundException($this->l->t('Please specify a valid circle'));
772+
throw new OCSNotFoundException($this->l->t('Please specify a valid team'));
773773
}
774774
$share->setSharedWith($shareWith);
775775
$share->setPermissions($permissions);
@@ -1964,7 +1964,7 @@ private function getAllShares(?Node $path = null, bool $reshares = false) {
19641964
// EMAIL SHARES
19651965
$mailShares = $this->shareManager->getSharesBy($this->currentUser, IShare::TYPE_EMAIL, $path, $reshares, -1, 0);
19661966

1967-
// CIRCLE SHARES
1967+
// TEAM SHARES
19681968
$circleShares = $this->shareManager->getSharesBy($this->currentUser, IShare::TYPE_CIRCLE, $path, $reshares, -1, 0);
19691969

19701970
// TALK SHARES

0 commit comments

Comments
 (0)