Skip to content

Commit 10fcb85

Browse files
PVince81PVince81
committed
Rename user to account in apps/settings
Signed-off-by: Vincent Petry <[email protected]>
1 parent 18431c2 commit 10fcb85

23 files changed

+61
-61
lines changed

‎apps/settings/lib/Controller/ChangePasswordController.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ public function changeUserPassword(string $username = null, string $password = n
132132
return new JSONResponse([
133133
'status' => 'error',
134134
'data' => [
135-
'message' => $this->l->t('No user supplied'),
135+
'message' => $this->l->t('No account name supplied'),
136136
],
137137
]);
138138
}
@@ -214,7 +214,7 @@ public function changeUserPassword(string $username = null, string $password = n
214214
return new JSONResponse([
215215
'status' => 'error',
216216
'data' => [
217-
'message' => $this->l->t('Please provide an admin recovery password; otherwise, all user data will be lost.'),
217+
'message' => $this->l->t('Please provide an admin recovery password; otherwise, all account data will be lost.'),
218218
]
219219
]);
220220
} elseif ($recoveryEnabledForUser && ! $validRecoveryPassword) {
@@ -240,7 +240,7 @@ public function changeUserPassword(string $username = null, string $password = n
240240
return new JSONResponse([
241241
'status' => 'error',
242242
'data' => [
243-
'message' => $this->l->t('Backend does not support password change, but the user\'s encryption key was updated.'),
243+
'message' => $this->l->t('Backend does not support password change, but the encryption of the account key was updated.'),
244244
]
245245
]);
246246
} elseif (!$result && !$recoveryEnabledForUser) {

‎apps/settings/lib/Controller/MailSettingsController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,6 @@ public function sendTestMail() {
182182
}
183183

184184
$this->config->setAppValue('core', 'emailTestSuccessful', '0');
185-
return new DataResponse($this->l10n->t('You need to set your user email before being able to send test emails. Go to %s for that.', [$this->urlGenerator->linkToRouteAbsolute('settings.PersonalSettings.index')]), Http::STATUS_BAD_REQUEST);
185+
return new DataResponse($this->l10n->t('You need to set your account email before being able to send test emails. Go to %s for that.', [$this->urlGenerator->linkToRouteAbsolute('settings.PersonalSettings.index')]), Http::STATUS_BAD_REQUEST);
186186
}
187187
}

‎apps/settings/lib/Controller/UsersController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ public function usersList(): TemplateResponse {
237237

238238
$disabledUsersGroup = [
239239
'id' => 'disabled',
240-
'name' => 'Disabled users',
240+
'name' => 'Disabled accounts',
241241
'usercount' => $disabledUsers
242242
];
243243

@@ -381,7 +381,7 @@ public function setUserSettings(?string $avatarScope = null,
381381
[
382382
'status' => 'error',
383383
'data' => [
384-
'message' => $this->l10n->t('Invalid user')
384+
'message' => $this->l10n->t('Invalid account')
385385
]
386386
],
387387
Http::STATUS_UNAUTHORIZED

‎apps/settings/lib/Mailer/NewUserMailHelper.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ public function generateTemplate(IUser $user, $generatePasswordResetToken = fals
133133
}
134134
$emailTemplate->addBodyText($l10n->t('Welcome to your %s account, you can add, protect, and share your data.', [$this->themingDefaults->getName()]));
135135
if ($user->getBackendClassName() !== 'LDAP') {
136-
$emailTemplate->addBodyText($l10n->t('Your username is: %s', [$userId]));
136+
$emailTemplate->addBodyText($l10n->t('Your account name is: %s', [$userId]));
137137
}
138138
if ($generatePasswordResetToken) {
139139
$leftButtonText = $l10n->t('Set your password');

‎apps/settings/lib/Middleware/SubadminMiddleware.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public function __construct(ControllerMethodReflector $reflector,
6767
public function beforeController($controller, $methodName) {
6868
if (!$this->reflector->hasAnnotation('NoSubAdminRequired') && !$this->reflector->hasAnnotation('AuthorizedAdminSetting')) {
6969
if (!$this->isSubAdmin) {
70-
throw new NotAdminException($this->l10n->t('Logged in user must be a subadmin'));
70+
throw new NotAdminException($this->l10n->t('Logged in account must be a subadmin'));
7171
}
7272
}
7373
}

‎apps/settings/lib/SetupChecks/CheckUserCertificates.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ public function description(): string {
4949
return '';
5050
}
5151
if ($this->configValue === 'not-run-yet') {
52-
return $this->l10n->t('A background job is pending that checks for user imported SSL certificates. Please check back later.');
52+
return $this->l10n->t('A background job is pending that checks for administrator-imported SSL certificates. Please check back later.');
5353
}
54-
return $this->l10n->t('There are some user imported SSL certificates present, that are not used anymore with Nextcloud 21. They can be imported on the command line via "occ security:certificates:import" command. Their paths inside the data directory are shown below.');
54+
return $this->l10n->t('There are some user administrator-imported SSL certificates present, that are not used anymore with Nextcloud 21. They can be imported on the command line via "occ security:certificates:import" command. Their paths inside the data directory are shown below.');
5555
}
5656

5757
public function severity(): string {

‎apps/settings/lib/SetupChecks/LdapInvalidUuids.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public function __construct(IAppManager $appManager, IL10N $l10n, IServerContain
4848
}
4949

5050
public function description(): string {
51-
return $this->l10n->t('Invalid UUIDs of LDAP users or groups have been found. Please review your "Override UUID detection" settings in the Expert part of the LDAP configuration and use "occ ldap:update-uuid" to update them.');
51+
return $this->l10n->t('Invalid UUIDs of LDAP accounts or groups have been found. Please review your "Override UUID detection" settings in the Expert part of the LDAP configuration and use "occ ldap:update-uuid" to update them.');
5252
}
5353

5454
public function severity(): string {

‎apps/settings/src/components/AdminTwoFactor.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template>
22
<NcSettingsSection :title="t('settings', 'Two-Factor Authentication')"
3-
:description="t('settings', 'Two-factor authentication can be enforced for all users and specific groups. If they do not have a two-factor provider configured, they will be unable to log into the system.')"
3+
:description="t('settings', 'Two-factor authentication can be enforced for all accounts and specific groups. If they do not have a two-factor provider configured, they will be unable to log into the system.')"
44
:doc-url="twoFactorAdminDoc">
55
<p v-if="loading">
66
<span class="icon-loading-small two-factor-loading" />
@@ -48,7 +48,7 @@
4848
<p class="top-margin">
4949
<em>
5050
<!-- this text is also found in the documentation. update it there as well if it ever changes -->
51-
{{ t('settings', 'When groups are selected/excluded, they use the following logic to determine if a user has 2FA enforced: If no groups are selected, 2FA is enabled for everyone except members of the excluded groups. If groups are selected, 2FA is enabled for all members of these. If a user is both in a selected and excluded group, the selected takes precedence and 2FA is enforced.') }}
51+
{{ t('settings', 'When groups are selected/excluded, they use the following logic to determine if an account has 2FA enforced: If no groups are selected, 2FA is enabled for everyone except members of the excluded groups. If groups are selected, 2FA is enabled for all members of these. If an account is both in a selected and excluded group, the selected takes precedence and 2FA is enforced.') }}
5252
</em>
5353
</p>
5454
</template>

‎apps/settings/src/components/AuthTokenSetupDialogue.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
{{ t('settings', 'Use the credentials below to configure your app or device.') }}
3939
{{ t('settings', 'For security reasons this password will only be shown once.') }}
4040
<div class="app-password-row">
41-
<label for="app-username" class="app-password-label">{{ t('settings', 'Username') }}</label>
41+
<label for="app-username" class="app-password-label">{{ t('settings', 'Account name') }}</label>
4242
<input id="app-username"
4343
:value="loginName"
4444
type="text"

‎apps/settings/src/components/BasicSettings/BackgroundJob.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
@update:checked="onBackgroundJobModeChanged">
5555
{{ t('settings', 'AJAX') }}
5656
</NcCheckboxRadioSwitch>
57-
<em>{{ t('settings', 'Execute one task with each page loaded. Use case: Single user instance.') }}</em>
57+
<em>{{ t('settings', 'Execute one task with each page loaded. Use case: Single account instance.') }}</em>
5858

5959
<NcCheckboxRadioSwitch type="radio"
6060
:checked.sync="backgroundJobsMode"
@@ -63,7 +63,7 @@
6363
@update:checked="onBackgroundJobModeChanged">
6464
{{ t('settings', 'Webcron') }}
6565
</NcCheckboxRadioSwitch>
66-
<em>{{ t('settings', 'cron.php is registered at a webcron service to call cron.php every 5 minutes over HTTP. Use case: Very small instance (1–5 users depending on the usage).') }}</em>
66+
<em>{{ t('settings', 'cron.php is registered at a webcron service to call cron.php every 5 minutes over HTTP. Use case: Very small instance (1–5 accounts depending on the usage).') }}</em>
6767

6868
<NcCheckboxRadioSwitch v-if="cliBasedCronPossible"
6969
type="radio"
@@ -127,7 +127,7 @@ export default {
127127
cronLabel() {
128128
let desc = t('settings', 'Use system cron service to call the cron.php file every 5 minutes. Recommended for all instances.')
129129
if (this.cliBasedCronPossible) {
130-
desc += ' ' + t('settings', 'The cron.php needs to be executed by the system user "{user}".', { user: this.cliBasedCronUser })
130+
desc += ' ' + t('settings', 'The cron.php needs to be executed by the system account "{user}".', { user: this.cliBasedCronUser })
131131
}
132132
return desc
133133
},

0 commit comments

Comments
 (0)