diff --git a/administrator/components/com_users/models/user.php b/administrator/components/com_users/models/user.php index 0a2f517bce256..bc210b637dac6 100644 --- a/administrator/components/com_users/models/user.php +++ b/administrator/components/com_users/models/user.php @@ -1207,8 +1207,8 @@ public function isValidSecretKey($user_id, $secretkey, $options = array()) $warnMessage = $options['warn_irq_msg']; } - // Warn the user if he's using a secret code but he has not - // enabled two factor auth in his account. + // Warn the user if they are using a secret code but they have not + // enabled two factor auth in their account. if (!empty($secretkey) && $warn) { try @@ -1300,7 +1300,7 @@ public function isValidOtep($user_id, $otep, $otpConfig = null) { /** * Two factor authentication enabled and no OTEPs defined. The - * user has used them all up. Therefore anything he enters is + * user has used them all up. Therefore anything they enter is * an invalid OTEP. */ return false; diff --git a/administrator/language/en-GB/en-GB.plg_system_logout.ini b/administrator/language/en-GB/en-GB.plg_system_logout.ini index 7437d006b83fc..132d8fcb5a5ba 100644 --- a/administrator/language/en-GB/en-GB.plg_system_logout.ini +++ b/administrator/language/en-GB/en-GB.plg_system_logout.ini @@ -3,7 +3,7 @@ ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 -PLG_SYSTEM_LOGOUT_XML_DESCRIPTION="The system logout plugin enables Joomla to redirect the user to the home page if he chooses to logout while he is on a protected access page." +PLG_SYSTEM_LOGOUT_XML_DESCRIPTION="The system logout plugin enables Joomla to redirect the user to the home page if they choose to logout while they are on a protected access page." PLG_SYSTEM_LOGOUT="System - Logout" PLG_SYSTEM_LOGOUT_REDIRECT="You have been redirected to the home page following logout." diff --git a/administrator/language/en-GB/en-GB.plg_system_logout.sys.ini b/administrator/language/en-GB/en-GB.plg_system_logout.sys.ini index 9a4604228e968..b41e59ff830e3 100644 --- a/administrator/language/en-GB/en-GB.plg_system_logout.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_system_logout.sys.ini @@ -3,5 +3,5 @@ ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 -PLG_SYSTEM_LOGOUT_XML_DESCRIPTION="The system logout plugin enables Joomla to redirect the user to the home page if he chooses to logout while he is on a protected access page." +PLG_SYSTEM_LOGOUT_XML_DESCRIPTION="The system logout plugin enables Joomla to redirect the user to the home page if they choose to logout while they are on a protected access page." PLG_SYSTEM_LOGOUT="System - Logout" diff --git a/language/en-GB/en-GB.com_users.ini b/language/en-GB/en-GB.com_users.ini index 018ee97f90ef6..708fa8e910d78 100644 --- a/language/en-GB/en-GB.com_users.ini +++ b/language/en-GB/en-GB.com_users.ini @@ -11,7 +11,7 @@ COM_USERS_DESIRED_PASSWORD="Enter your desired password." COM_USERS_DESIRED_USERNAME="Enter your desired username." COM_USERS_EDIT_PROFILE="Edit Profile" COM_USERS_EMAIL_ACCOUNT_DETAILS="Account Details for %s at %s" -COM_USERS_EMAIL_ACTIVATE_WITH_ADMIN_ACTIVATION_BODY="Hello administrator,\n\nA new user has registered at %s.\nThe user has verified his email address and requests that you approve his account.\nThis email contains their details:\n\n Name : %s \n email: %s \n Username: %s \n\nYou can activate the user by selecting on the link below:\n %s \n" +COM_USERS_EMAIL_ACTIVATE_WITH_ADMIN_ACTIVATION_BODY="Hello administrator,\n\nA new user has registered at %s.\nThe user has verified their email address and requests that you approve their account.\nThis email contains their details:\n\n Name : %s \n email: %s \n Username: %s \n\nYou can activate the user by selecting on the link below:\n %s \n" COM_USERS_EMAIL_ACTIVATE_WITH_ADMIN_ACTIVATION_SUBJECT="Registration approval required for account of %s at %s" COM_USERS_EMAIL_ACTIVATED_BY_ADMIN_ACTIVATION_BODY="Hello %s,\n\nYour account has been activated by an administrator. You can now login at %s using the username %s and the password you chose while registering." COM_USERS_EMAIL_ACTIVATED_BY_ADMIN_ACTIVATION_SUBJECT="Account activated for %s at %s" diff --git a/libraries/joomla/user/authentication.php b/libraries/joomla/user/authentication.php index 84993ed90fad5..94f799853ff29 100644 --- a/libraries/joomla/user/authentication.php +++ b/libraries/joomla/user/authentication.php @@ -406,7 +406,7 @@ class JAuthenticationResponse * value MUST always be 10. If the End User user does not want to reveal any particular * component of this value, it MUST be set to zero. * - * For instance, if an End User wants to specify that his date of birth is in 1980, but + * For instance, if an End User wants to specify that their date of birth is in 1980, but * not the month or day, the value returned SHALL be "1980-00-00". * * @var string diff --git a/plugins/authentication/joomla/joomla.php b/plugins/authentication/joomla/joomla.php index 29791eaf249f3..f3e9b2529f594 100644 --- a/plugins/authentication/joomla/joomla.php +++ b/plugins/authentication/joomla/joomla.php @@ -118,8 +118,8 @@ public function onUserAuthenticate($credentials, $options, &$response) // Check if the user has enabled two factor authentication if (empty($otpConfig->method) || ($otpConfig->method == 'none')) { - // Warn the user if he's using a secret code but he has not - // enabed two factor auth in his account. + // Warn the user if they are using a secret code but they have not + // enabed two factor auth in their account. if (!empty($credentials['secretkey'])) { try @@ -184,7 +184,7 @@ public function onUserAuthenticate($credentials, $options, &$response) { /* * Two factor authentication enabled and no OTEPs defined. The - * user has used them all up. Therefore anything he enters is + * user has used them all up. Therefore anything they enter is * an invalid OTEP. */ return; diff --git a/plugins/user/joomla/joomla.php b/plugins/user/joomla/joomla.php index 5b0ecd2e0eacb..9c65e524c6c63 100644 --- a/plugins/user/joomla/joomla.php +++ b/plugins/user/joomla/joomla.php @@ -315,7 +315,7 @@ public function onUserLogout($user, $options = array()) /** * This method will return a user object * - * If options['autoregister'] is true, if the user doesn't exist yet he will be created + * If options['autoregister'] is true, if the user doesn't exist yet they will be created * * @param array $user Holds the user data. * @param array $options Array holding options (remember, autoregister, group).