Merge pull request #45398 from nextcloud/chore/account-name

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

apps/settings/src/components/AdminSettingsSharingForm.vue

@@ -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>
 

apps/settings/src/components/Users/NewUserModal.vue

@@ -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() {

apps/settings/src/components/Users/UserListHeader.vue

@@ -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"
@@ -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">

core/src/components/login/LoginForm.vue

@@ -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')
 			}
-			return t('core', 'Login with username')
+			return t('core', 'Login with account name')
 		},
 	},
 

cypress/e2e/core/header_access-levels.cy.ts

@@ -108,7 +108,7 @@ describe('Header: Ensure regular users do not have admin settings in the Setting
 			// I see that the "Apps" item in the Settings menu is shown
 			cy.contains('li', 'Apps').should('be.visible')
 			// I see that the "Users" item in the Settings menu is shown
-			cy.contains('li', 'Users').should('be.visible')
+			cy.contains('li', 'Accounts').should('be.visible')
 			// I see that the "Help" item in the Settings menu is shown
 			cy.contains('li', 'Help').should('be.visible')
 			// I see that the "Log out" item in the Settings menu is shown

lib/private/NavigationManager.php

@@ -326,7 +326,7 @@ class NavigationManager implements INavigationManager {
 					'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'),
 				]);
 			}