Skip to content

Commit 8d4de1e

Browse files
PVince81PVince81
committed
Rename users to account or person
Replace translated texts in comments, files_sharing, core and lib. Signed-off-by: Vincent Petry <[email protected]>
1 parent 0577f86 commit 8d4de1e

File tree

43 files changed

+78
-78
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+78
-78
lines changed

‎apps/comments/lib/Notification/Notifier.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ public function prepare(INotification $notification, string $languageCode): INot
136136
];
137137

138138
if ($isDeletedActor) {
139-
$subject = $l->t('You were mentioned on "{file}", in a comment by a user that has since been deleted');
139+
$subject = $l->t('You were mentioned on "{file}", in a comment by an account that has since been deleted');
140140
} else {
141141
$subject = $l->t('{user} mentioned you in a comment on "{file}"');
142142
$subjectParameters['user'] = [

‎apps/comments/tests/Unit/Notification/NotifierTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ public function testPrepareSuccess() {
217217

218218
public function testPrepareSuccessDeletedUser() {
219219
$fileName = 'Gre\'thor.odp';
220-
$message = 'You were mentioned on "Gre\'thor.odp", in a comment by a user that has since been deleted';
220+
$message = 'You were mentioned on "Gre\'thor.odp", in a comment by an account that has since been deleted';
221221

222222
/** @var Node|MockObject $node */
223223
$node = $this->createMock(Node::class);
@@ -263,7 +263,7 @@ public function testPrepareSuccessDeletedUser() {
263263
$this->notification
264264
->expects($this->once())
265265
->method('setRichSubject')
266-
->with('You were mentioned on "{file}", in a comment by a user that has since been deleted', $this->anything())
266+
->with('You were mentioned on "{file}", in a comment by an account that has since been deleted', $this->anything())
267267
->willReturnSelf();
268268
$this->notification
269269
->expects($this->once())

‎apps/federation/appinfo/info.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
xsi:noNamespaceSchemaLocation="https://apps.nextcloud.com/schema/apps/info.xsd">
44
<id>federation</id>
55
<name>Federation</name>
6-
<summary>Federation allows you to connect with other trusted servers to exchange the user directory.</summary>
7-
<description>Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing.</description>
6+
<summary>Federation allows you to connect with other trusted servers to exchange the account directory.</summary>
7+
<description>Federation allows you to connect with other trusted servers to exchange the account directory. For example this will be used to auto-complete external accounts for federated sharing.</description>
88
<version>1.15.0</version>
99
<licence>agpl</licence>
1010
<author>Bjoern Schiessle</author>

‎apps/federation/templates/settings-admin.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
?>
99
<div id="ocFederationSettings" class="section">
1010
<h2><?php p($l->t('Trusted servers')); ?></h2>
11-
<p class="settings-hint"><?php p($l->t('Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing. It is not necessary to add a server as trusted server in order to create a federated share.')); ?></p>
11+
<p class="settings-hint"><?php p($l->t('Federation allows you to connect with other trusted servers to exchange the account directory. For example this will be used to auto-complete external accounts for federated sharing. It is not necessary to add a server as trusted server in order to create a federated share.')); ?></p>
1212

1313
<ul id="listOfTrustedServers">
1414
<?php foreach ($_['trustedServers'] as $trustedServer) { ?>

‎apps/files_sharing/appinfo/info.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<name>File sharing</name>
66
<summary>File sharing</summary>
77
<description>
8-
This application enables users to share files within Nextcloud. If enabled, the admin can choose which groups can share files. The applicable users can then share files and folders with other users and groups within Nextcloud. In addition, if the admin enables the share link feature, an external link can be used to share files with other users outside of Nextcloud. Admins can also enforce passwords, expirations dates, and enable server to server sharing via share links, as well as sharing from mobile devices.
8+
This application enables people to share files within Nextcloud. If enabled, the admin can choose which groups can share files. The applicable people can then share files and folders with other people and groups within Nextcloud. In addition, if the admin enables the share link feature, an external link can be used to share files with other people outside of Nextcloud. Admins can also enforce passwords, expirations dates, and enable server to server sharing via share links, as well as sharing from mobile devices.
99
Turning the feature off removes shared files and folders on the server for all share recipients, and also on the sync clients and mobile apps. More information is available in the Nextcloud Documentation.
1010

1111
</description>

‎apps/files_sharing/lib/Controller/ShareAPIController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -530,7 +530,7 @@ public function createShare(
530530
if ($shareType === IShare::TYPE_USER) {
531531
// Valid user is required to share
532532
if ($shareWith === null || !$this->userManager->userExists($shareWith)) {
533-
throw new OCSNotFoundException($this->l->t('Please specify a valid user'));
533+
throw new OCSNotFoundException($this->l->t('Please specify a valid person to share with'));
534534
}
535535
$share->setSharedWith($shareWith);
536536
$share->setPermissions($permissions);
@@ -617,7 +617,7 @@ public function createShare(
617617
}
618618

619619
if ($shareWith === null) {
620-
throw new OCSNotFoundException($this->l->t('Please specify a valid federated user ID'));
620+
throw new OCSNotFoundException($this->l->t('Please specify a valid federated account ID'));
621621
}
622622

623623
$share->setSharedWith($shareWith);

‎apps/files_sharing/src/components/SharingEntryInternal.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,9 @@ export default {
7474
7575
internalLinkSubtitle() {
7676
if (this.fileInfo.type === 'dir') {
77-
return t('files_sharing', 'Only works for users with access to this folder')
77+
return t('files_sharing', 'Only works for people with access to this folder')
7878
}
79-
return t('files_sharing', 'Only works for users with access to this file')
79+
return t('files_sharing', 'Only works for people with access to this file')
8080
},
8181
},
8282

‎apps/files_sharing/src/views/SharingInherited.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ export default {
9494
},
9595
subTitle() {
9696
return (this.showInheritedShares && this.shares.length === 0)
97-
? t('files_sharing', 'No other users with access found')
97+
? t('files_sharing', 'No other accounts with access found')
9898
: ''
9999
},
100100
toggleTooltip() {

‎apps/files_sharing/tests/Controller/ShareAPIControllerTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1662,7 +1662,7 @@ public function testCreateShareInvalidPermissions() {
16621662

16631663
public function testCreateShareUserNoShareWith() {
16641664
$this->expectException(\OCP\AppFramework\OCS\OCSNotFoundException::class);
1665-
$this->expectExceptionMessage('Please specify a valid user');
1665+
$this->expectExceptionMessage('Please specify a person to share with');
16661666

16671667
$share = $this->newShare();
16681668
$this->shareManager->method('newShare')->willReturn($share);
@@ -1698,7 +1698,7 @@ public function testCreateShareUserNoShareWith() {
16981698

16991699
public function testCreateShareUserNoValidShareWith() {
17001700
$this->expectException(\OCP\AppFramework\OCS\OCSNotFoundException::class);
1701-
$this->expectExceptionMessage('Please specify a valid user');
1701+
$this->expectExceptionMessage('Please specify a valid person to share with');
17021702

17031703
$share = $this->newShare();
17041704
$this->shareManager->method('newShare')->willReturn($share);

‎core/Command/Maintenance/Install.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,10 @@ protected function configure() {
6464
->addOption('database-name', null, InputOption::VALUE_REQUIRED, 'Name of the database')
6565
->addOption('database-host', null, InputOption::VALUE_REQUIRED, 'Hostname of the database', 'localhost')
6666
->addOption('database-port', null, InputOption::VALUE_REQUIRED, 'Port the database is listening on')
67-
->addOption('database-user', null, InputOption::VALUE_REQUIRED, 'User name to connect to the database')
67+
->addOption('database-user', null, InputOption::VALUE_REQUIRED, 'Account name to connect to the database')
6868
->addOption('database-pass', null, InputOption::VALUE_OPTIONAL, 'Password of the database user', null)
6969
->addOption('database-table-space', null, InputOption::VALUE_OPTIONAL, 'Table space of the database (oci only)', null)
70-
->addOption('admin-user', null, InputOption::VALUE_REQUIRED, 'User name of the admin account', 'admin')
70+
->addOption('admin-user', null, InputOption::VALUE_REQUIRED, 'Account name of the admin account', 'admin')
7171
->addOption('admin-pass', null, InputOption::VALUE_REQUIRED, 'Password of the admin account')
7272
->addOption('admin-email', null, InputOption::VALUE_OPTIONAL, 'E-Mail of the admin account')
7373
->addOption('data-dir', null, InputOption::VALUE_REQUIRED, 'Path to data directory', \OC::$SERVERROOT."/data");
@@ -148,7 +148,7 @@ protected function validateInput(InputInterface $input, OutputInterface $output,
148148

149149
if ($db !== 'sqlite') {
150150
if (is_null($dbUser)) {
151-
throw new InvalidArgumentException("Database user not provided.");
151+
throw new InvalidArgumentException("Database account not provided.");
152152
}
153153
if (is_null($dbName)) {
154154
throw new InvalidArgumentException("Database name not provided.");

0 commit comments

Comments
 (0)