Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Rename to teams #1512

Merged
merged 2 commits into from
Feb 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
# Nextcloud Circles
# Nextcloud Teams


### Bring cloud-users closer together

Circles allow people to create their own groups of people/colleagues/friends.
Those groups of people (or circles) can then be used by any other app for sharing purpose
through the Circles API
Nextcloud Teams allow people to create their own groups of people/colleagues/friends.
Those groups of people can then be used by any other app for sharing purpose.

The app was formerly named circles which is still used as internal identifier a lot.


# Installation
The *Circles* app is installed and enabled by default since Nextcloud 22.
The *Teams* app is installed and enabled by default.

# Documentation
You can use the `\Psr\Container\ContainerInterface`, see [dependency injection](https://docs.nextcloud.com/server/stable/developer_manual/basics/dependency_injection.html), to get the `\OCA\Circles\CireclesManager` class, see our [API documentation](https://nextcloud.github.io/circles/) for its interface.
Expand Down
6 changes: 3 additions & 3 deletions appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<info xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="https://apps.nextcloud.com/schema/apps/info.xsd">
<id>circles</id>
<name>Circles</name>
<name>Teams</name>
<summary>Bring cloud-users closer together.</summary>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This could use a better summary, maybe from @jospoortvliet?

<description><![CDATA[Circles allows people to create their own groups of people/colleagues/friends.
Those groups of people (or "circles") can then be used by any other app for sharing purpose.
<description><![CDATA[Teams allows people to create their own groups of people/colleagues/friends.
Those groups of people can then be used by any other app for sharing purpose.
]]>
</description>
<version>29.0.0-dev</version>
Expand Down
2 changes: 1 addition & 1 deletion img/circles.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion js/files/circles.files.app.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
}
);

this._fileList.appName = t('circles', 'Circles');
this._fileList.appName = t('circles', 'Teams');
return this._fileList;
},

Expand Down
10 changes: 5 additions & 5 deletions js/files/circles.files.list.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
FileList.prototype = _.extend({}, OCA.Files.FileList.prototype,
/** @lends OCA.Circles.FileList.prototype */ {
id: 'circlesfilter',
appName: t('circles', 'Circles\' files'),
appName: t('circles', 'Teams\' files'),

/**
* Array of system tag ids to filter by
Expand Down Expand Up @@ -88,7 +88,7 @@
this.$filterField = $('<input type="hidden" name="circles"/>');
$container.append(this.$filterField);
this.$filterField.select2({
placeholder: t('circles', 'Select circles to filter by'),
placeholder: t('circles', 'Select team to filter by'),
allowClear: false,
multiple: true,
toggleSelect: true,
Expand Down Expand Up @@ -149,7 +149,7 @@
return m;
},
formatNoMatches: function() {
return t('circles', 'No circles found');
return t('circles', 'No teams found');
}
});
this.$filterField.on('change', _.bind(this._onTagsChanged, this));
Expand Down Expand Up @@ -205,12 +205,12 @@
// no tags selected
this.$el.find('.emptyfilelist.emptycontent').html(
'<div class="icon-systemtags"></div>' +
'<h2>' + t('circles', 'Please select circles to filter by') + '</h2>');
'<h2>' + t('circles', 'Please select teams to filter by') + '</h2>');
} else {
// tags selected but no results
this.$el.find('.emptyfilelist.emptycontent').html(
'<div class="icon-systemtags"></div>' +
'<h2>' + t('circles', 'No files found for the selected circles') + '</h2>');
'<h2>' + t('circles', 'No files found for the selected teams') + '</h2>');
}
this.$el.find('.emptyfilelist.emptycontent').toggleClass('hidden', !this.isEmpty);
this.$el.find('.files-filestable thead th').toggleClass('hidden', this.isEmpty);
Expand Down
2 changes: 1 addition & 1 deletion lib/Activity/Filter.php
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public function getIdentifier() {
* @since 11.0.0
*/
public function getName() {
return $this->l10n->t('Circles');
return $this->l10n->t('Teams');
}

/**
Expand Down
4 changes: 2 additions & 2 deletions lib/Activity/ProviderSubjectCircle.php
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ public function parseSubjectCircleCreate(IEvent $event, Circle $circle): void {

$this->parseCircleEvent(
$event, $circle,
$this->l10n->t('You created the circle {circle}'),
$this->l10n->t('{author} created the circle {circle}')
$this->l10n->t('You created the team {circle}'),
$this->l10n->t('{author} created the team {circle}')
);

throw new FakeException();
Expand Down
4 changes: 2 additions & 2 deletions lib/Activity/ProviderSubjectCircleMember.php
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,8 @@ public function parseSubjectCircleMemberAdd(

$this->parseMemberCircleEvent(
$event, $circle, $member,
$this->l10n->t('You added circle {member} as member to {circle}'),
$this->l10n->t('{author} added circle {member} has been added as member to {circle}')
$this->l10n->t('You added team {member} as member to {circle}'),
$this->l10n->t('{author} added team {member} has been added as member to {circle}')
);

throw new FakeException();
Expand Down
2 changes: 1 addition & 1 deletion lib/Activity/SettingAsMember.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public function getIdentifier() {
* @since 11.0.0
*/
public function getName() {
return $this->l10n->t('On events happening in a <strong>Circle</strong> of which you are a member');
return $this->l10n->t('On events happening in a <strong>team</strong> of which you are a member');
}


Expand Down
2 changes: 1 addition & 1 deletion lib/Activity/SettingAsModerator.php
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public function getIdentifier() {
* @since 11.0.0
*/
public function getName() {
return $this->l10n->t('Any important event in a <strong>Circle</strong> you are moderating');
return $this->l10n->t('Any important event in a <strong>team</strong> you are moderating');
}

/**
Expand Down
2 changes: 1 addition & 1 deletion lib/Activity/SettingAsNonMember.php
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public function getIdentifier() {
* @since 11.0.0
*/
public function getName() {
return $this->l10n->t('On global events happening in any <strong>Circle</strong>');
return $this->l10n->t('On global events happening in any <strong>team</strong>');
}


Expand Down
8 changes: 4 additions & 4 deletions lib/AppInfo/Capabilities.php
Original file line number Diff line number Diff line change
Expand Up @@ -111,15 +111,15 @@ private function getCapabilitiesCircleConstants(): array {
Circle::CFG_VISIBLE => $this->l10n->t('Visible'),
Circle::CFG_OPEN => $this->l10n->t('Open'),
Circle::CFG_INVITE => $this->l10n->t('Invite'),
Circle::CFG_REQUEST => $this->l10n->t('Join Request'),
Circle::CFG_REQUEST => $this->l10n->t('Join request'),
Circle::CFG_FRIEND => $this->l10n->t('Friends'),
Circle::CFG_PROTECTED => $this->l10n->t('Password Protected'),
Circle::CFG_PROTECTED => $this->l10n->t('Password protected'),
Circle::CFG_NO_OWNER => $this->l10n->t('No Owner'),
Circle::CFG_HIDDEN => $this->l10n->t('Hidden'),
Circle::CFG_BACKEND => $this->l10n->t('Backend'),
Circle::CFG_LOCAL => $this->l10n->t('Local'),
Circle::CFG_ROOT => $this->l10n->t('Root'),
Circle::CFG_CIRCLE_INVITE => $this->l10n->t('Circle Invite'),
Circle::CFG_CIRCLE_INVITE => $this->l10n->t('Team invite'),
Circle::CFG_FEDERATED => $this->l10n->t('Federated'),
Circle::CFG_MOUNTPOINT => $this->l10n->t('Mount point')
],
Expand All @@ -128,7 +128,7 @@ private function getCapabilitiesCircleConstants(): array {
'core' => [
Member::TYPE_USER => $this->l10n->t('Nextcloud Account'),
Member::TYPE_GROUP => $this->l10n->t('Nextcloud Group'),
Member::TYPE_MAIL => $this->l10n->t('Email Address'),
Member::TYPE_MAIL => $this->l10n->t('Email address'),
Member::TYPE_CONTACT => $this->l10n->t('Contact'),
Member::TYPE_CIRCLE => $this->l10n->t('Circle'),
Member::TYPE_APP => $this->l10n->t('Nextcloud App')
Expand Down
2 changes: 1 addition & 1 deletion lib/Model/DeprecatedCircle.php
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ public function cantBePersonal() {
public function hasToBeFederated() {
if ($this->getSetting('allow_links') !== 'true') {
throw new FederatedCircleNotAllowedException(
$this->l10n->t('The circle is not federated')
$this->l10n->t('The team is not federated')
);
}
}
Expand Down
4 changes: 2 additions & 2 deletions lib/Model/DeprecatedMember.php
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public function joinCircle($circleType) {
return $this->joinClosedCircle();
}

throw new MemberCantJoinCircleException($this->l10n->t('You cannot join this circle'));
throw new MemberCantJoinCircleException($this->l10n->t('You cannot join this team'));
}


Expand Down Expand Up @@ -169,7 +169,7 @@ public function hasToBeMemberOrAlmost() {
public function cantBeOwner() {
if ($this->getLevel() === self::LEVEL_OWNER) {
throw new MemberIsOwnerException(
$this->l10n->t('This member is the owner of the circle')
$this->l10n->t('This member is the owner of the team')
);
}
}
Expand Down
2 changes: 1 addition & 1 deletion lib/Model/ShareWrapper.php
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,7 @@ private function setShareDisplay(IShare $share, IURLGenerator $urlGenerator): vo
$display = $circle->getDisplayName();
if ($circle->getSource() === Member::TYPE_CIRCLE) {
$l10n = \OCP\Server::get(IFactory::class)->get('circles');
$display = $l10n->t('%s (Circle owned by %s)', [$display, $circle->getOwner()->getDisplayName()]);
$display = $l10n->t('%s (Team owned by %s)', [$display, $circle->getOwner()->getDisplayName()]);
} else {
$display .= ' (' . Circle::$DEF_SOURCE[$circle->getSource()] . ')';
}
Expand Down
4 changes: 2 additions & 2 deletions lib/Search/UnifiedSearchProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ public function getId(): string {
* @return string
*/
public function getName(): string {
return $this->l10n->t('Circles');
return $this->l10n->t('Teams');
}


Expand Down Expand Up @@ -118,7 +118,7 @@ public function search(IUser $user, ISearchQuery $query): SearchResult {
}

return SearchResult::paginated(
$this->l10n->t('Circles'),
$this->l10n->t('Teams'),
$result,
($query->getCursor() ?? 0) + $query->getLimit()
);
Expand Down
2 changes: 1 addition & 1 deletion lib/Service/CircleService.php
Original file line number Diff line number Diff line change
Expand Up @@ -732,7 +732,7 @@ public function getDefinitionCircle(Circle $circle): string {
}

if ($circle->isConfig(Circle::CFG_PERSONAL)) {
return $this->l10n->t('Personal Circle');
return $this->l10n->t('Personal team');
}

if ($circle->hasOwner()) {
Expand Down
2 changes: 1 addition & 1 deletion lib/Service/PermissionService.php
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public function confirmCircleCreation(): void {
$this->confirm(ConfigService::LIMIT_CIRCLE_CREATION);
} catch (InsufficientPermissionException $e) {
throw new InsufficientPermissionException(
$this->l10n->t('You have no permission to create a new circle')
$this->l10n->t('You have no permission to create a new team')
);
}
}
Expand Down
2 changes: 1 addition & 1 deletion lib/ShareByCircleProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ public function create(IShare $share): IShare {
try {
$knowShareWrapper = $this->shareWrapperService->searchShare($share->getSharedWith(), $nodeId);
throw new AlreadySharedException(
$this->l10n->t('This item is already shared with this circle'),
$this->l10n->t('This item is already shared with this team'),
$knowShareWrapper->getShare($this->rootFolder, $this->userManager, $this->urlGenerator)
);
} catch (ShareWrapperNotFoundException $e) {
Expand Down
Loading
Loading