From 6878d90d53723bf32d2a8b1cf05d0aeef574b7a3 Mon Sep 17 00:00:00 2001 From: provokateurin Date: Mon, 13 Jan 2025 10:54:10 +0100 Subject: [PATCH] chore: Rename app to Team folders Signed-off-by: provokateurin --- .github/ISSUE_TEMPLATE/Bug_report.md | 6 +-- .github/ISSUE_TEMPLATE/Feature_request.md | 4 +- README.md | 46 +++++++++---------- appinfo/info.xml | 10 ++-- lib/Command/ACL.php | 2 +- lib/Command/Create.php | 2 +- lib/Command/Delete.php | 4 +- .../ExpireGroupVersionsPlaceholder.php | 4 +- lib/Command/Group.php | 2 +- lib/Command/ListCommand.php | 4 +- lib/Command/Quota.php | 2 +- lib/Command/Rename.php | 2 +- lib/Command/Scan.php | 14 +++--- lib/Command/Trashbin/Cleanup.php | 10 ++-- lib/DAV/ACLPlugin.php | 4 +- .../Version104000Date20180918132853.php | 2 +- .../Version201000Date20190111132839.php | 2 +- lib/Settings/Section.php | 2 +- lib/Trash/TrashBackend.php | 6 +-- lib/Versions/VersionsBackend.php | 6 +-- src/actions/openGroupfolderAction.ts | 2 +- src/components/SharingSidebarView.vue | 2 +- src/init.ts | 8 ++-- src/settings/App.tsx | 12 ++--- templates/index.php | 2 +- 25 files changed, 80 insertions(+), 80 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/Bug_report.md b/.github/ISSUE_TEMPLATE/Bug_report.md index 0e70dc0da..79150ef13 100644 --- a/.github/ISSUE_TEMPLATE/Bug_report.md +++ b/.github/ISSUE_TEMPLATE/Bug_report.md @@ -7,7 +7,7 @@ labels: bug, 0. Needs triage -# Group Folders +# Team folders [![REUSE status](https://api.reuse.software/badge/github.com/nextcloud/groupfolders)](https://api.reuse.software/info/github.com/nextcloud/groupfolders) @@ -16,22 +16,22 @@ [^1]: The releases are now managed in a [dedicated release repository](https://github.com/nextcloud-releases/groupfolders/releases). The releases in this repository may be outdated. -## Configuring Group Folders +## Configuring Team folder -Group Folders can be configured through *Group Folders* under *Administration settings*. +Team folders can be configured through *Team folders* under *Administration settings*. After a folder is created, the admin can give access to the folder to one or more groups, a quota can be assigned for the folder and advanced permissions can be activated and configured. ![edit](screenshots/edit.png) -Permissions to the content of a group folder can be configured on a per-group basis. +Permissions to the content of a Team folder can be configured on a per-group basis. ![permissions](screenshots/permissions.png) The configuration options include the _Write_, _Share_ and _Delete_ permissions for each group. -## Using Group Folders +## Using Team folders Once configured, the folders will show up in the home folder for each user in the configured groups. @@ -39,13 +39,13 @@ Once configured, the folders will show up in the home folder for each user in th ## Setting Advanced Permissions -_Advanced Permissions_ allows entitled users to configure permissions inside groupfolders on a per file and folder basis. +_Advanced Permissions_ allows entitled users to configure permissions inside Team folders on a per file and folder basis. -Permissions are configured by setting one or more of "Read", "Write", "Create", "Delete" or "Share" permissions to "allow" or "deny". Any permission not explicitly set will inherit the permissions from the parent folder. If multiple configured advanced permissions for a single file or folder apply for a single user (such as when a user belongs to multiple groups), the "allow" permission will overwrite any "deny" permission. Denied permissions configured for the group folder itself cannot be overwritten to "allow" permissions by the advanced permission rules. +Permissions are configured by setting one or more of "Read", "Write", "Create", "Delete" or "Share" permissions to "allow" or "deny". Any permission not explicitly set will inherit the permissions from the parent folder. If multiple configured advanced permissions for a single file or folder apply for a single user (such as when a user belongs to multiple groups), the "allow" permission will overwrite any "deny" permission. Denied permissions configured for the Team folder itself cannot be overwritten to "allow" permissions by the advanced permission rules. ![advanced permissions](screenshots/acl.png) -Users or whole groups can be entitled to set advanced permissions for each group folder separately on the group folders admin page. +Users or whole groups can be entitled to set advanced permissions for each Team folder separately on the Team folders admin page. For entitlements, only users from those groups are selectable which have to be configured selected in the Groups column. ![advanced permission entitlement](screenshots/aclAdmin.png) @@ -54,7 +54,7 @@ For entitlements, only users from those groups are selectable which have to be c Some settings are currently only exposed via `config/config.php`: -### Default quota for new groupfolders +### Default quota for new Team folders ```injectablephp 'groupfolders.quota.default' => -3, @@ -64,24 +64,24 @@ The special value `-3` means unlimited and any other value is the quota limit in ## Command-line interface management and configuration (via `occ`) -Group folders can be configured and managed from the command-line interface (CLI). This is accomplished by using the `occ` command. +Team folders can be configured and managed from the command-line interface (CLI). This is accomplished by using the `occ` command. -The `occ` command is utilized throughout Nextcloud for many operations and is not specific to Group Folders. When the Group Folders app is enabled, the `occ` command gains additional functionality specific to Group Folders. +The `occ` command is utilized throughout Nextcloud for many operations and is not specific to Team folders. When the Team folders app is enabled, the `occ` command gains additional functionality specific to Team folders. If you're unfamiliar with `occ` see [Using the occ command](https://docs.nextcloud.com/server/latest/admin_manual/configuration_server/occ_command.html) in the Nextcloud Server Administration Guide for general guidance. ### Commands Available -- `occ groupfolders:create ` → create a group folder -- `occ groupfolders:delete [-f|--force]` → delete a group folder and all its contents +- `occ groupfolders:create ` → create a Team folder +- `occ groupfolders:delete [-f|--force]` → delete a Team folder and all its contents - `occ groupfolders:expire` → trigger file version and trashbin expiration (see [Nextcloud docs for versioning](https://docs.nextcloud.com/server/latest/admin_manual/configuration_files/file_versioning.html) and [Nextcloud docs for the trash bin](https://docs.nextcloud.com/server/latest/admin_manual/configuration_files/trashbin_configuration.html) for details) -- `occ groupfolders:group [-d|--delete] [write|share|delete]` → assign groups and their rights to a group folder -- `occ groupfolders:list` → list configured group folders +- `occ groupfolders:group [-d|--delete] [write|share|delete]` → assign groups and their rights to a Team folder +- `occ groupfolders:list` → list configured Team folders - `occ groupfolders:permissions` → configure advanced permissions (see below for details) -- `occ groupfolders:quota [|unlimited]` → set a quota for a group folder -- `occ groupfolders:rename ` → rename a group folder -- `occ groupfolders:scan ` → trigger a filescan for a group folder -- `occ groupfolders:trashbin:cleanup` → empty the trashbin of all group folders +- `occ groupfolders:quota [|unlimited]` → set a quota for a Team folder +- `occ groupfolders:rename ` → rename a Team folder +- `occ groupfolders:scan ` → trigger a filescan for a Team folder +- `occ groupfolders:trashbin:cleanup` → empty the trashbin of all Team folders - `occ config:app:set groupfolders enable_encryption --value="true"` → activate encryption (server-side) support ### Configuring Advanced Permissions via `occ` @@ -90,7 +90,7 @@ Advanced permissions can also be configured through the `occ groupfolders:permis #### Enabling -Before configuring any advanced permissions you'll first have to enable advanced permissions for the folder using `occ groupfolders:permissions --enable`. To do this you'll first need to find the `folder_id` of the groupfolder you're trying to configure. You can use `occ groupfolders:list` to find the `folder_id` of the target folder. +Before configuring any advanced permissions you'll first have to enable advanced permissions for the folder using `occ groupfolders:permissions --enable`. To do this you'll first need to find the `folder_id` of the Team folder you're trying to configure. You can use `occ groupfolders:list` to find the `folder_id` of the target folder. #### Using @@ -120,7 +120,7 @@ To manage the users or groups entitled to set advanced permissions, use `occ gro #### Disabling -To disable the advanced permissions feature for a group folder, use `occ groupfolders:permissions --disable`. +To disable the advanced permissions feature for a Team folder, use `occ groupfolders:permissions --disable`. ## APIs @@ -130,7 +130,7 @@ See the [OpenAPI specification](openapi.json) to learn about all available API e ### WebDAV API -Group folders are also exposed through a separate [WebDAV API](https://docs.nextcloud.com/server/latest/user_manual/en/files/access_webdav.html) at `/remote.php/dav/groupfolders/`. +Team folders are also exposed through a separate [WebDAV API](https://docs.nextcloud.com/server/latest/user_manual/en/files/access_webdav.html) at `/remote.php/dav/groupfolders/`. -In addition to browsing the contents of the group folders, you can also request the mount point for the group folder by requesting the `{http://nextcloud.org/ns}mount-point` property. +In addition to browsing the contents of the Team folders, you can also request the mount point for the Team folder by requesting the `{http://nextcloud.org/ns}mount-point` property. diff --git a/appinfo/info.xml b/appinfo/info.xml index 5ee3e75e4..c96281063 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -5,13 +5,13 @@ --> groupfolders - Group folders - Admin configured folders shared with everyone in a group - Team folders + Admin configured folders shared with everyone in a Team + 19.0.0-alpha.1 agpl diff --git a/lib/Command/ACL.php b/lib/Command/ACL.php index 995844d03..f2456fe81 100644 --- a/lib/Command/ACL.php +++ b/lib/Command/ACL.php @@ -38,7 +38,7 @@ public function __construct( protected function configure(): void { $this ->setName('groupfolders:permissions') - ->setDescription('Configure advanced permissions for a configured group folder') + ->setDescription('Configure advanced permissions for a configured Team folder') ->addArgument('folder_id', InputArgument::REQUIRED, 'Id of the folder to configure') ->addOption('enable', 'e', InputOption::VALUE_NONE, 'Enable advanced permissions for the folder') ->addOption('disable', 'd', InputOption::VALUE_NONE, 'Disable advanced permissions for the folder') diff --git a/lib/Command/Create.php b/lib/Command/Create.php index 0020afa27..64fe6192c 100644 --- a/lib/Command/Create.php +++ b/lib/Command/Create.php @@ -24,7 +24,7 @@ public function __construct( protected function configure(): void { $this ->setName('groupfolders:create') - ->setDescription('Create a new group folder') + ->setDescription('Create a new Team folder') ->addArgument('name', InputArgument::REQUIRED, 'Name of the new folder'); parent::configure(); } diff --git a/lib/Command/Delete.php b/lib/Command/Delete.php index 228db84fd..3033ab0b9 100644 --- a/lib/Command/Delete.php +++ b/lib/Command/Delete.php @@ -18,7 +18,7 @@ class Delete extends FolderCommand { protected function configure(): void { $this ->setName('groupfolders:delete') - ->setDescription('Delete group folder') + ->setDescription('Delete Team folder') ->addArgument('folder_id', InputArgument::REQUIRED, 'Id of the folder to rename') ->addOption('force', 'f', InputOption::VALUE_NONE, 'Skip confirmation'); parent::configure(); @@ -31,7 +31,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int } $helper = $this->getHelper('question'); - $question = new ConfirmationQuestion('Are you sure you want to delete the group folder ' . $folder['mount_point'] . ' and all files within, this cannot be undone (y/N).', false); + $question = new ConfirmationQuestion('Are you sure you want to delete the Team folder ' . $folder['mount_point'] . ' and all files within, this cannot be undone (y/N).', false); if ($input->getOption('force') || $helper->ask($input, $output, $question)) { $folderMount = $this->mountProvider->getFolder($folder['id']); $this->folderManager->removeFolder($folder['id']); diff --git a/lib/Command/ExpireGroupVersionsPlaceholder.php b/lib/Command/ExpireGroupVersionsPlaceholder.php index cb3a8be52..ec9eea4b6 100644 --- a/lib/Command/ExpireGroupVersionsPlaceholder.php +++ b/lib/Command/ExpireGroupVersionsPlaceholder.php @@ -16,12 +16,12 @@ class ExpireGroupVersionsPlaceholder extends Base { protected function configure(): void { $this ->setName('groupfolders:expire') - ->setDescription('Trigger expiry of versions for files stored in group folders'); + ->setDescription('Trigger expiry of versions for files stored in Team folders'); parent::configure(); } protected function execute(InputInterface $input, OutputInterface $output): int { - $output->writeln('groupfolder version handling is only supported with Nextcloud 15 and up'); + $output->writeln('Team folder version handling is only supported with Nextcloud 15 and up'); return 0; } } diff --git a/lib/Command/Group.php b/lib/Command/Group.php index f82d61250..823502966 100644 --- a/lib/Command/Group.php +++ b/lib/Command/Group.php @@ -38,7 +38,7 @@ public function __construct( protected function configure(): void { $this ->setName('groupfolders:group') - ->setDescription('Edit the groups that have access to a group folder') + ->setDescription('Edit the groups that have access to a Team folder') ->addArgument('folder_id', InputArgument::REQUIRED, 'Id of the folder to configure') ->addArgument('group', InputArgument::REQUIRED, 'The group to configure') ->addArgument('permissions', InputArgument::OPTIONAL | InputArgument::IS_ARRAY, 'The permissions to set for the group, leave empty for read only') diff --git a/lib/Command/ListCommand.php b/lib/Command/ListCommand.php index e1473e21b..2b5eafcc8 100644 --- a/lib/Command/ListCommand.php +++ b/lib/Command/ListCommand.php @@ -41,8 +41,8 @@ public function __construct( protected function configure(): void { $this ->setName('groupfolders:list') - ->setDescription('List the configured group folders') - ->addOption('user', 'u', InputArgument::OPTIONAL, 'List group folders applicable for a user'); + ->setDescription('List the configured Team folders') + ->addOption('user', 'u', InputArgument::OPTIONAL, 'List Team folders applicable for a user'); parent::configure(); } diff --git a/lib/Command/Quota.php b/lib/Command/Quota.php index 4d021d9de..cf0cd0d43 100644 --- a/lib/Command/Quota.php +++ b/lib/Command/Quota.php @@ -17,7 +17,7 @@ class Quota extends FolderCommand { protected function configure(): void { $this ->setName('groupfolders:quota') - ->setDescription('Edit the quota of a configured group folder') + ->setDescription('Edit the quota of a configured Team folder') ->addArgument('folder_id', InputArgument::REQUIRED, 'Id of the folder to configure') ->addArgument('quota', InputArgument::REQUIRED, 'New value for the quota of the folder'); parent::configure(); diff --git a/lib/Command/Rename.php b/lib/Command/Rename.php index a14560c28..b48355041 100644 --- a/lib/Command/Rename.php +++ b/lib/Command/Rename.php @@ -16,7 +16,7 @@ class Rename extends FolderCommand { protected function configure(): void { $this ->setName('groupfolders:rename') - ->setDescription('Rename group folder') + ->setDescription('Rename Team folder') ->addArgument('folder_id', InputArgument::REQUIRED, 'Id of the folder to rename') ->addArgument('name', InputArgument::REQUIRED, 'New value name of the folder'); parent::configure(); diff --git a/lib/Command/Scan.php b/lib/Command/Scan.php index 5c0703a8e..b294afb91 100644 --- a/lib/Command/Scan.php +++ b/lib/Command/Scan.php @@ -21,16 +21,16 @@ class Scan extends FolderCommand { protected function configure(): void { $this ->setName('groupfolders:scan') - ->setDescription('Scan a group folder for outside changes') + ->setDescription('Scan a Team folder for outside changes') ->addArgument( 'folder_id', InputArgument::OPTIONAL, - 'Id of the group folder to scan.' + 'Id of the Team folder to scan.' )->addOption( 'all', null, InputOption::VALUE_NONE, - 'Scan all the group folders.' + 'Scan all the Team folders.' ) ->addOption( 'path', @@ -50,12 +50,12 @@ protected function execute(InputInterface $input, OutputInterface $output): int $folderId = $input->getArgument('folder_id'); $all = $input->getOption('all'); if ($folderId === null && !$all) { - $output->writeln('Either a group folder id or --all needs to be provided'); + $output->writeln('Either a Team folder id or --all needs to be provided'); return -1; } if ($folderId !== null && $all) { - $output->writeln('Specifying a group folder id and --all are mutually exclusive'); + $output->writeln('Specifying a Team folder id and --all are mutually exclusive'); return -1; } @@ -87,9 +87,9 @@ protected function execute(InputInterface $input, OutputInterface $output): int /** @var IScanner&\OC\Hooks\BasicEmitter $scanner */ $scanner = $mount->getStorage()->getScanner(); - $output->writeln("Scanning group folder with id\t{$folder['id']}", OutputInterface::VERBOSITY_VERBOSE); + $output->writeln("Scanning Team folder with id\t{$folder['id']}", OutputInterface::VERBOSITY_VERBOSE); if ($scanner instanceof ObjectStoreScanner) { - $output->writeln('Scanning group folders using an object store as primary storage is not supported.'); + $output->writeln('Scanning Team folders using an object store as primary storage is not supported.'); return -1; } diff --git a/lib/Command/Trashbin/Cleanup.php b/lib/Command/Trashbin/Cleanup.php index 8f1611402..9f595ea60 100644 --- a/lib/Command/Trashbin/Cleanup.php +++ b/lib/Command/Trashbin/Cleanup.php @@ -35,15 +35,15 @@ public function __construct( protected function configure(): void { $this ->setName('groupfolders:trashbin:cleanup') - ->setDescription('Empty the groupfolder trashbin') - ->addArgument('folder_id', InputArgument::OPTIONAL, 'Id of the groupfolder') + ->setDescription('Empty the Team folder trashbin') + ->addArgument('folder_id', InputArgument::OPTIONAL, 'Id of the Team folder') ->addOption('force', 'f', InputOption::VALUE_NONE, 'Skip confirmation'); parent::configure(); } protected function execute(InputInterface $input, OutputInterface $output): int { if (!$this->trashBackend) { - $output->writeln('files_trashbin is disabled: group folders trashbin is not available'); + $output->writeln('files_trashbin is disabled: Team folders trashbin is not available'); return -1; } @@ -56,7 +56,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int foreach ($folders as $folder) { if ($folder['id'] === $folderId) { - $question = new ConfirmationQuestion('Are you sure you want to empty the trashbin of your group folder with id ' . $folderId . ', this can not be undone (y/N).', false); + $question = new ConfirmationQuestion('Are you sure you want to empty the trashbin of your Team folder with id ' . $folderId . ', this can not be undone (y/N).', false); if (!$input->getOption('force') && !$helper->ask($input, $output, $question)) { return -1; } @@ -71,7 +71,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int return -1; } else { - $question = new ConfirmationQuestion('Are you sure you want to empty the trashbin of your group folders, this can not be undone (y/N).', false); + $question = new ConfirmationQuestion('Are you sure you want to empty the trashbin of your Team folders, this can not be undone (y/N).', false); if (!$input->getOption('force') && !$helper->ask($input, $output, $question)) { return -1; } diff --git a/lib/DAV/ACLPlugin.php b/lib/DAV/ACLPlugin.php index ee4b279a6..a27a68e16 100644 --- a/lib/DAV/ACLPlugin.php +++ b/lib/DAV/ACLPlugin.php @@ -205,13 +205,13 @@ public function propPatch(string $path, PropPatch $propPatch): void { $formattedRules = array_map(fn (Rule $rule): string => $rule->getUserMapping()->getType() . ' ' . $rule->getUserMapping()->getDisplayName() . ': ' . $rule->formatPermissions(), $rules); if (count($formattedRules)) { $formattedRules = implode(', ', $formattedRules); - $this->eventDispatcher->dispatchTyped(new CriticalActionPerformedEvent('The advanced permissions for "%s" in groupfolder with id %d was set to "%s"', [ + $this->eventDispatcher->dispatchTyped(new CriticalActionPerformedEvent('The advanced permissions for "%s" in Team folder with id %d was set to "%s"', [ $fileInfo->getInternalPath(), $mount->getFolderId(), $formattedRules, ])); } else { - $this->eventDispatcher->dispatchTyped(new CriticalActionPerformedEvent('The advanced permissions for "%s" in groupfolder with id %d was cleared', [ + $this->eventDispatcher->dispatchTyped(new CriticalActionPerformedEvent('The advanced permissions for "%s" in Team folder with id %d was cleared', [ $fileInfo->getInternalPath(), $mount->getFolderId(), ])); diff --git a/lib/Migration/Version104000Date20180918132853.php b/lib/Migration/Version104000Date20180918132853.php index 0e3612599..0c772bbab 100644 --- a/lib/Migration/Version104000Date20180918132853.php +++ b/lib/Migration/Version104000Date20180918132853.php @@ -18,7 +18,7 @@ public function name(): string { } public function description(): string { - return 'Adds table to store trashbin information for group folders'; + return 'Adds table to store trashbin information for Team folders'; } public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper { diff --git a/lib/Migration/Version201000Date20190111132839.php b/lib/Migration/Version201000Date20190111132839.php index caaad04c6..e148b37df 100644 --- a/lib/Migration/Version201000Date20190111132839.php +++ b/lib/Migration/Version201000Date20190111132839.php @@ -18,7 +18,7 @@ public function name(): string { } public function description(): string { - return 'Adds table to store ACL information for group folders'; + return 'Adds table to store ACL information for Team folders'; } public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper { diff --git a/lib/Settings/Section.php b/lib/Settings/Section.php index 60f3ed3e9..c87e0527f 100644 --- a/lib/Settings/Section.php +++ b/lib/Settings/Section.php @@ -23,7 +23,7 @@ public function getID(): string { } public function getName(): string { - return $this->l->t('Group folders'); + return $this->l->t('Team folders'); } public function getPriority(): int { diff --git a/lib/Trash/TrashBackend.php b/lib/Trash/TrashBackend.php index 9063f7c83..e964815f5 100644 --- a/lib/Trash/TrashBackend.php +++ b/lib/Trash/TrashBackend.php @@ -101,7 +101,7 @@ public function listTrashFolder(ITrashItem $folder): array { */ public function restoreItem(ITrashItem $item): void { if (!($item instanceof GroupTrashItem)) { - throw new \LogicException('Trying to restore normal trash item in group folder trash backend'); + throw new \LogicException('Trying to restore normal trash item in Team folder trash backend'); } $user = $item->getUser(); @@ -203,7 +203,7 @@ private function unwrapJails(IStorage $storage, string $internalPath): array { */ public function removeItem(ITrashItem $item): void { if (!($item instanceof GroupTrashItem)) { - throw new \LogicException('Trying to remove normal trash item in group folder trash backend'); + throw new \LogicException('Trying to remove normal trash item in Team folder trash backend'); } $user = $item->getUser(); @@ -268,7 +268,7 @@ public function moveToTrash(IStorage $storage, string $internalPath): bool { $storage->getCache()->remove($internalPath); } } else { - throw new \Exception('Failed to move groupfolder item to trash'); + throw new \Exception('Failed to move Team folder item to trash'); } return true; diff --git a/lib/Versions/VersionsBackend.php b/lib/Versions/VersionsBackend.php index a326b1df7..057990678 100644 --- a/lib/Versions/VersionsBackend.php +++ b/lib/Versions/VersionsBackend.php @@ -63,7 +63,7 @@ private function getFolderIdForFile(FileInfo $file): int { /** @var GroupFolderStorage $storage */ return $storage->getFolderId(); } - throw new \LogicException('groupfolder version backend called for non groupfolder file'); + throw new \LogicException('Team folder version backend called for non Team folder file'); } public function getVersionFolderForFile(FileInfo $file): Folder { @@ -106,7 +106,7 @@ public function getVersionsForFile(IUser $user, FileInfo $file): array { $versionsOnFS = $versionsFolder->getDirectoryListing(); foreach ($versionsOnFS as $version) { if ($version instanceof Folder) { - $this->logger->error('Found an unexpected subfolder inside the groupfolder version folder.'); + $this->logger->error('Found an unexpected subfolder inside the Team folder version folder.'); } $versionEntity = new GroupVersionEntity(); @@ -205,7 +205,7 @@ public function createVersion(IUser $user, FileInfo $file): void { public function rollback(IVersion $version): void { if (!($version instanceof GroupVersion)) { - throw new \LogicException('Trying to restore a version from a file not in a group folder'); + throw new \LogicException('Trying to restore a version from a file not in a Team folder'); } if (!$this->currentUserHasPermissions($version->getSourceFile(), \OCP\Constants::PERMISSION_UPDATE)) { diff --git a/src/actions/openGroupfolderAction.ts b/src/actions/openGroupfolderAction.ts index f1a01d905..7ea4b050a 100644 --- a/src/actions/openGroupfolderAction.ts +++ b/src/actions/openGroupfolderAction.ts @@ -9,7 +9,7 @@ import { t } from '@nextcloud/l10n' export const action = new FileAction({ id: 'open-group-folders', - displayName: () => t('files', 'Open group folder'), + displayName: () => t('files', 'Open Team folder'), iconSvgInline: () => '', enabled: (files, view) => view.id === appName, diff --git a/src/components/SharingSidebarView.vue b/src/components/SharingSidebarView.vue index bbdba1fe4..4dc007de4 100644 --- a/src/components/SharingSidebarView.vue +++ b/src/components/SharingSidebarView.vue @@ -12,7 +12,7 @@ - {{ t('groupfolders', 'Group folder') }} + {{ t('groupfolders', 'Team folder') }} {{ t('groupfolders', 'Read') }} diff --git a/src/init.ts b/src/init.ts index 09ad1e815..7a23bdff4 100644 --- a/src/init.ts +++ b/src/init.ts @@ -15,11 +15,11 @@ registerFileAction(openGroupfolderAction) const Navigation = getNavigation() Navigation.register(new View({ id: appName, - name: t('groupfolders', 'Group folders'), - caption: t('groupfolders', 'List of group folders.'), + name: t('groupfolders', 'Team folders'), + caption: t('groupfolders', 'List of Team folders.'), - emptyTitle: t('groupfolders', 'No group folders yet'), - emptyCaption: t('groupfolders', 'Group folders will show up here'), + emptyTitle: t('groupfolders', 'No Team folders yet'), + emptyCaption: t('groupfolders', 'Team folders will show up here'), icon: GroupFolderSvg, order: 20, diff --git a/src/settings/App.tsx b/src/settings/App.tsx index c0852b7b6..edc74e76e 100644 --- a/src/settings/App.tsx +++ b/src/settings/App.tsx @@ -184,16 +184,16 @@ export class App extends Component implements OC.Plugin -

{ t('groupfolders', 'Group folder admin delegation') }

-

{ t('groupfolders', 'Nextcloud allows you to delegate the administration of group folders to non-admin users.') }

-

{ t('groupfolders', 'Specify below the groups that will be allowed to manage group folders and use its API/REST.') }

-

{ t('groupfolders', 'They will have access to all group folders.') }

+

{ t('groupfolders', 'Team folder admin delegation') }

+

{ t('groupfolders', 'Nextcloud allows you to delegate the administration of Team folders to non-admin users.') }

+

{ t('groupfolders', 'Specify below the groups that will be allowed to manage Team folders and use its API/REST.') }

+

{ t('groupfolders', 'They will have access to all Team folders.') }

-

{ t('groupfolders', 'Specify below the groups that will be allowed to manage group folders and use its API/REST only.') }

-

{ t('groupfolders', 'They will only have access to group folders for which they have advanced permissions.') }

+

{ t('groupfolders', 'Specify below the groups that will be allowed to manage Team folders and use its API/REST only.') }

+

{ t('groupfolders', 'They will only have access to Team folders for which they have advanced permissions.') }