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

chore(settings): Change "user" to "account" #45398

Merged
merged 6 commits into from
May 21, 2024
Merged
Show file tree
Hide file tree
Changes from 5 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
6 changes: 3 additions & 3 deletions apps/settings/src/components/AdminSettingsSharingForm.vue
Original file line number Diff line number Diff line change
Expand Up @@ -160,17 +160,17 @@
<NcCheckboxRadioSwitch type="switch"
aria-controls="settings-sharing-privacy-user-enumeration"
:checked.sync="settings.allowShareDialogUserEnumeration">
{{ t('settings', 'Allow username autocompletion in share dialog and allow access to the system address book') }}
{{ t('settings', 'Allow account name autocompletion in share dialog and allow access to the system address book') }}
</NcCheckboxRadioSwitch>
<fieldset v-show="settings.allowShareDialogUserEnumeration" id="settings-sharing-privacy-user-enumeration" class="sharing__sub-section">
<em>
{{ t('settings', 'If autocompletion "same group" and "phone number integration" are enabled a match in either is enough to show the user.') }}
</em>
<NcCheckboxRadioSwitch :checked.sync="settings.restrictUserEnumerationToGroup">
{{ t('settings', 'Allow username autocompletion to users within the same groups and limit system address books to users in the same groups') }}
{{ t('settings', 'Allow account name autocompletion to users within the same groups and limit system address books to users in the same groups') }}
</NcCheckboxRadioSwitch>
<NcCheckboxRadioSwitch :checked.sync="settings.restrictUserEnumerationToPhone">
{{ t('settings', 'Allow username autocompletion to users based on phone number integration') }}
{{ t('settings', 'Allow account name autocompletion to users based on phone number integration') }}
</NcCheckboxRadioSwitch>
</fieldset>

Expand Down
4 changes: 2 additions & 2 deletions apps/settings/src/components/Users/NewUserModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -220,9 +220,9 @@ export default {

usernameLabel() {
if (this.settings.newUserGenerateUserID) {
return t('settings', 'Username will be autogenerated')
return t('settings', 'Account name will be autogenerated')
}
return t('settings', 'Username (required)')
return t('settings', 'Account name (required)')
},

minPasswordLength() {
Expand Down
4 changes: 2 additions & 2 deletions apps/settings/src/components/Users/UserListHeader.vue
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
data-cy-user-list-header-username
scope="col">
<span>
{{ t('settings', 'Username') }}
{{ t('settings', 'Account name') }}
</span>
</th>
<th class="header__cell"
Expand Down Expand Up @@ -81,7 +81,7 @@
data-cy-user-list-header-storage-location
scope="col">
<span v-if="showConfig.showUserBackend">
{{ t('settings', 'User backend') }}
{{ t('settings', 'Account backend') }}
</span>
<span v-if="showConfig.showStoragePath"
class="header__subtitle">
Expand Down
4 changes: 2 additions & 2 deletions core/src/components/login/LoginForm.vue
Original file line number Diff line number Diff line change
Expand Up @@ -238,9 +238,9 @@ export default {
},
loginText() {
if (this.emailEnabled) {
return t('core', 'Login with username or email')
return t('core', 'Login with account name or email')
szaimen marked this conversation as resolved.
Show resolved Hide resolved
}
return t('core', 'Login with username')
return t('core', 'Login with account name')
szaimen marked this conversation as resolved.
Show resolved Hide resolved
},
},

Expand Down
6 changes: 3 additions & 3 deletions dist/core-login.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/core-login.js.map

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions dist/settings-users-3239.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/settings-users-3239.js.map

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions dist/settings-vue-settings-admin-sharing.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/settings-vue-settings-admin-sharing.js.map

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions dist/settings-vue-settings-apps-users-management.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/settings-vue-settings-apps-users-management.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion lib/private/NavigationManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ private function init() {
'id' => 'core_users',
'order' => 6,
'href' => $this->urlGenerator->linkToRoute('settings.Users.usersList'),
'name' => $l->t('Users'),
'name' => $l->t('Accounts'),
'icon' => $this->urlGenerator->imagePath('settings', 'users.svg'),
]);
}
Expand Down
Loading