Merge pull request #48687 from nextcloud/chore/gender-neutral-language

chore: Use more gender neutral language

apps/dav/lib/BackgroundJob/GenerateBirthdayCalendarBackgroundJob.php

@@ -34,7 +34,7 @@ public function run($argument) {
 		$userId = $argument['userId'];
 		$purgeBeforeGenerating = $argument['purgeBeforeGenerating'] ?? false;
 
-		// make sure admin didn't change his mind
+		// make sure admin didn't change their mind
 		$isGloballyEnabled = $this->config->getAppValue('dav', 'generateBirthdayCalendar', 'yes');
 		if ($isGloballyEnabled !== 'yes') {
 			return;

apps/dav/lib/Files/Sharing/PublicLinkCheckPlugin.php

@@ -41,7 +41,7 @@ public function initialize(\Sabre\DAV\Server $server) {
 	}
 
 	public function beforeMethod(RequestInterface $request, ResponseInterface $response) {
-		// verify that the owner didn't have his share permissions revoked
+		// verify that the owner didn't have their share permissions revoked
 		if ($this->fileInfo && !$this->fileInfo->isShareable()) {
 			throw new NotFound();
 		}

apps/encryption/lib/Crypto/DecryptAll.php

@@ -73,7 +73,7 @@ public function prepare(InputInterface $input, OutputInterface $output, $user) {
 			$recoveryKeyId = $this->keyManager->getRecoveryKeyId();
 			if (!empty($user)) {
 				$output->writeln('You can only decrypt the users files if you know');
-				$output->writeln('the users password or if he activated the recovery key.');
+				$output->writeln('the users password or if they activated the recovery key.');
 				$output->writeln('');
 				$questionUseLoginPassword = new ConfirmationQuestion(
 					'Do you want to use the users login password to decrypt all files? (y/n) ',

apps/encryption/lib/Crypto/Encryption.php

@@ -432,7 +432,7 @@ public function getUnencryptedBlockSize($signed = false) {
 	 * e.g. if all encryption keys exists
 	 *
 	 * @param string $path
-	 * @param string $uid user for whom we want to check if he can read the file
+	 * @param string $uid user for whom we want to check if they can read the file
 	 * @return bool
 	 * @throws DecryptionFailedException
 	 */

apps/encryption/lib/Hooks/UserHooks.php

@@ -175,7 +175,7 @@ public function setPassphrase($params) {
 		// Get existing decrypted private key
 		$user = $this->userSession->getUser();
 
-		// current logged in user changes his own password
+		// current logged in user changes their own password
 		if ($user && $params['uid'] === $user->getUID()) {
 			$privateKey = $this->session->getPrivateKey();
 

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

@@ -73,7 +73,7 @@
 					:required="!settings.isAdmin && !settings.isDelegatedAdmin"
 					@input="handleGroupInput"
 					@option:created="createGroup" />
-					<!-- If user is not admin, he is a subadmin.
+					<!-- If user is not admin, they are a subadmin.
 						Subadmins can't create users outside their groups
 						Therefore, empty select is forbidden -->
 			</div>

apps/user_ldap/lib/Access.php

@@ -1172,7 +1172,7 @@ private function processPagedSearchStatus(
 				return false;
 			}
 			// if count is bigger, then the server does not support
-			// paged search. Instead, he did a normal search. We set a
+			// paged search. Instead, they did a normal search. We set a
 			// flag here, so the callee knows how to deal with it.
 			if ($foundItems <= $limit) {
 				$this->pagedSearchedSuccessful = true;

apps/user_ldap/lib/ILDAPUserPlugin.php

@@ -58,7 +58,7 @@ public function getDisplayName($uid);
 	public function setDisplayName($uid, $displayName);
 
 	/**
-	 * checks whether the user is allowed to change his avatar in Nextcloud
+	 * checks whether the user is allowed to change their avatar in Nextcloud
 	 * @param string $uid the Nextcloud user name
 	 * @return boolean either the user can or cannot
 	 */

apps/user_ldap/lib/User/User.php

@@ -659,7 +659,7 @@ private function updateProfile(array $profileValues): void {
 				$currentValue = '';
 				$scope = $defaultScopes[$property];
 			}
-			$verified = IAccountManager::VERIFIED; // trust the LDAP admin knew what he put there
+			$verified = IAccountManager::VERIFIED; // trust the LDAP admin knew what they put there
 			if ($currentValue !== $value) {
 				$account->setProperty($property, $value, $scope, $verified);
 				$this->logger->debug('update user profile: ' . $property . '=' . $value
@@ -854,7 +854,7 @@ public function handlePasswordExpiry($params) {
 				exit();
 			}
 			//handle pwdReset attribute
-			if (!empty($pwdReset) && $pwdReset[0] === 'TRUE') { //user must change his password
+			if (!empty($pwdReset) && $pwdReset[0] === 'TRUE') { //user must change their password
 				$this->config->setUserValue($uid, 'user_ldap', 'needsPasswordReset', 'true');
 				header('Location: ' . \OC::$server->getURLGenerator()->linkToRouteAbsolute(
 					'user_ldap.renewPassword.showRenewPasswordForm', ['user' => $uid]));

apps/user_ldap/lib/UserPluginManager.php

@@ -95,7 +95,7 @@ public function setPassword($uid, $password) {
 	}
 
 	/**
-	 * checks whether the user is allowed to change his avatar in Nextcloud
+	 * checks whether the user is allowed to change their avatar in Nextcloud
 	 * @param string $uid the Nextcloud user name
 	 * @return boolean either the user can or cannot
 	 * @throws \Exception

apps/user_ldap/lib/User_LDAP.php

@@ -43,7 +43,7 @@ public function __construct(
 	}
 
 	/**
-	 * checks whether the user is allowed to change his avatar in Nextcloud
+	 * checks whether the user is allowed to change their avatar in Nextcloud
 	 *
 	 * @param string $uid the Nextcloud user name
 	 * @return boolean either the user can or cannot

apps/user_ldap/lib/User_Proxy.php

@@ -295,7 +295,7 @@ public function setDisplayName($uid, $displayName) {
 	}
 
 	/**
-	 * checks whether the user is allowed to change his avatar in Nextcloud
+	 * checks whether the user is allowed to change their avatar in Nextcloud
 	 *
 	 * @param string $uid the Nextcloud user name
 	 * @return boolean either the user can or cannot

lib/private/DateTimeZone.php

@@ -31,7 +31,7 @@ public function __construct(IConfig $config, ISession $session) {
 	}
 
 	/**
-	 * Get the timezone of the current user, based on his session information and config data
+	 * Get the timezone of the current user, based on their session information and config data
 	 *
 	 * @param bool|int $timestamp
 	 * @return \DateTimeZone

lib/private/Federation/CloudIdManager.php

@@ -125,7 +125,7 @@ protected function getDisplayNameFromContact(string $cloudId): ?string {
 			if (isset($entry['CLOUD'])) {
 				foreach ($entry['CLOUD'] as $cloudID) {
 					if ($cloudID === $cloudId) {
-						// Warning, if user decides to make his full name local only,
+						// Warning, if user decides to make their full name local only,
 						// no FN is found on federated servers
 						if (isset($entry['FN'])) {
 							return $entry['FN'];

lib/private/FullTextSearch/Model/SearchTemplate.php

@@ -20,7 +20,7 @@
  * when the getSearchTemplate() method is called.
  *
  * The object will contain templates to be displayed, and the list of the different
- * options to be available to the user when he start a new search.
+ * options to be available to the user when they start a new search.
  *
  * The display of the Options is generated by the FullTextSearch app and Options
  * can be displayed in 2 places:

lib/private/KnownUser/KnownUserService.php

@@ -39,7 +39,7 @@ public function deleteByContactUserId(string $contactUserId): int {
 	}
 
 	/**
-	 * Store a match because $knownTo has $contactUserId in his phonebook
+	 * Store a match because $knownTo has $contactUserId in their phonebook
 	 *
 	 * @param string $knownTo User id of the owner of the phonebook
 	 * @param string $contactUserId User id of the contact in the phonebook

lib/private/Tags.php

@@ -242,7 +242,7 @@ public function getIdsForTag($tag) {
 
 	/**
 	 * Checks whether a tag is saved for the given user,
-	 * disregarding the ones shared with him or her.
+	 * disregarding the ones shared with them.
 	 *
 	 * @param string $name The tag name to check for.
 	 * @param string $user The user whose tags are to be checked.

lib/private/User/User.php

@@ -394,7 +394,7 @@ public function getBackend(): ?UserInterface {
 	}
 
 	/**
-	 * Check if the backend allows the user to change his avatar on Personal page
+	 * Check if the backend allows the user to change their avatar on Personal page
 	 *
 	 * @return bool
 	 */

lib/public/Encryption/IEncryptionModule.php

@@ -125,7 +125,7 @@ public function getUnencryptedBlockSize($signed = false);
 	 * e.g. if all encryption keys exists
 	 *
 	 * @param string $path
-	 * @param string $uid user for whom we want to check if he can read the file
+	 * @param string $uid user for whom we want to check if they can read the file
 	 * @return boolean
 	 * @since 8.1.0
 	 */

lib/public/Files/Node.php

@@ -243,7 +243,7 @@ public function lock($type);
 	 * Check the type of an existing lock.
 	 *
 	 * A shared lock can be changed to an exclusive lock is there is exactly one shared lock on the file,
-	 * an exclusive lock can always be changed to a shared lock since there can only be one exclusive lock int he first place.
+	 * an exclusive lock can always be changed to a shared lock since there can only be one exclusive lock in the first place.
 	 *
 	 * A locked exception will be thrown when these preconditions are not met.
 	 * Note that this is also the case if no existing lock exists for the file.

lib/public/FullTextSearch/Model/ISearchTemplate.php

@@ -16,7 +16,7 @@
  * when the getSearchTemplate() method is called.
  *
  * The object will contain templates to be displayed, and the list of the different
- * options to be available to the user when he start a new search.
+ * options to be available to the user when they start a new search.
  *
  * The display of the Options is generated by the FullTextSearch app and Options
  * can be displayed in 2 places:

lib/public/ITags.php

@@ -104,7 +104,7 @@ public function hasTag(string $name): bool;
 
 	/**
 	 * Checks whether a tag is saved for the given user,
-	 * disregarding the ones shared with him or her.
+	 * disregarding the ones shared with them.
 	 *
 	 * @param string $name The tag name to check for.
 	 * @param string $user The user whose tags are to be checked.

lib/public/IUser.php

@@ -117,7 +117,7 @@ public function getBackendClassName();
 	public function getBackend();
 
 	/**
-	 * check if the backend allows the user to change his avatar on Personal page
+	 * check if the backend allows the user to change their avatar on Personal page
 	 *
 	 * @return bool
 	 * @since 8.0.0