Merge pull request #15509 from mauriciofauth/neutral-pronouns

Use gender-neutral pronouns

ChangeLog

@@ -5,6 +5,7 @@ phpMyAdmin - ChangeLog
 - issue #15350 Change Media (MIME) type references to Media type
 - issue #15377 Add a request router
 - issue        Automatically focus input in the two-factor authentication window
+- issue #15509 Replace gender-specific pronouns with gender-neutral pronouns
 
 5.0.0 (not yet released)
 - issue #13896 Drop support for PHP 5.5, PHP 5.6, PHP 7.0 and HHVM

doc/config.rst

@@ -1044,7 +1044,7 @@ Server connection settings
 
     Since release 4.1.0 you can create different user groups with menu items
     attached to them. Users can be assigned to these groups and the logged in
-    user would only see menu items configured to the usergroup he is assigned to.
+    user would only see menu items configured to the usergroup they are assigned to.
     To do this it needs two tables "usergroups" (storing allowed menu items for each
     user group) and "users" (storing users and their assignments to user groups).
 

doc/faq.rst

@@ -355,7 +355,7 @@ PHP scripts. Of course you have to restart Apache.
 
 This is a permission problem. Right-click on the phpmyadmin folder and
 choose properties. Under the tab Security, click on "Add" and select
-the user "IUSR\_machine" from the list. Now set his permissions and it
+the user "IUSR\_machine" from the list. Now set their permissions and it
 should work.
 
 .. _faq1_27:
@@ -1133,7 +1133,7 @@ Starting with 2.2.5, in the user management page, you can enter a
 wildcard database name for a user (for example "joe%"), and put the
 privileges you want. For example, adding ``SELECT, INSERT, UPDATE,
 DELETE, CREATE, DROP, INDEX, ALTER`` would let a user create/manage
-his/her database(s).
+their database(s).
 
 .. _faq4_6:
 
@@ -1694,7 +1694,7 @@ user-input situation. Instead you have to initialize mimetypes using
 functions or empty mimetype definitions.
 
 Plus, you have a whole overview of available mimetypes. Who knows all those
-mimetypes by heart so he/she can enter it at will?
+mimetypes by heart so they can enter it at will?
 
 .. _faqbookmark:
 
@@ -2216,7 +2216,7 @@ authentication to the Apache environment and it can be used in Apache
 logs. Currently there are two variables available:
 
 ``userID``
-    User name of currently active user (he does not have to be logged in).
+    User name of currently active user (they do not have to be logged in).
 ``userStatus``
     Status of currently active user, one of ``ok`` (user is logged in),
     ``mysql-denied`` (MySQL denied user login), ``allow-denied`` (user denied

doc/privileges.rst

@@ -60,7 +60,7 @@ will see in the phpMyAdmin navigation.
 
 .. warning::
 
-    This feature only limits what a user sees, he is still able to use all the
+    This feature only limits what a user sees, they are still able to use all the
     functions. So this can not be considered as a security limitation. Should
     you want to limit what users can do, use MySQL privileges to achieve that.
 

js/functions.js

@@ -2160,7 +2160,7 @@ Functions.updateCode = function ($base, htmlValue, rawValue) {
  *
  * 4) var $msg = Functions.ajaxShowMessage('Some error', false);
  * This will show a message that will not disappear automatically, but it
- * can be dismissed by the user after he has finished reading it.
+ * can be dismissed by the user after they have finished reading it.
  *
  * @param string  message     string containing the message to be shown.
  *                              optional, defaults to 'Loading...'
@@ -2254,7 +2254,7 @@ Functions.ajaxShowMessage = function (message, timeout, type) {
     if (dismissable) {
         $retval.addClass('dismissable').css('cursor', 'pointer');
         /**
-         * Add a tooltip to the notification to let the user know that (s)he
+         * Add a tooltip to the notification to let the user know that they
          * can dismiss the ajax notification by clicking on it.
          */
         Functions.tooltip(
@@ -3423,7 +3423,7 @@ AJAX.registerOnload('functions.js', function () {
         }
         var fields = '';
         // If there are no values, maybe the user is about to make a
-        // new list so we add a few for him/her to get started with.
+        // new list so we add a few for them to get started with.
         if (values.length === 0) {
             values.push('', '', '', '');
         }

js/server/status/monitor.js

@@ -132,7 +132,7 @@ AJAX.registerOnload('server/status/monitor.js', function () {
     // Whenever the monitor object (runtime.charts) or the settings object
     // (monitorSettings) changes in a way incompatible to the previous version,
     // increase this number. It will reset the users monitor and settings object
-    // in his localStorage to the default configuration
+    // in their localStorage to the default configuration
     var monitorProtocolVersion = '1.0';
 
     // Runtime parameter of the monitor, is being fully set in initGrid()
@@ -500,9 +500,9 @@ AJAX.registerOnload('server/status/monitor.js', function () {
             if (type === 'preset') {
                 newChart = presetCharts[$('#addChartDialog').find('select[name="presetCharts"]').prop('value')];
             } else {
-                // If user builds his own chart, it's being set/updated
-                // each time he adds a series
-                // So here we only warn if he didn't add a series yet
+                // If user builds their own chart, it's being set/updated
+                // each time they add a series
+                // So here we only warn if they didn't add a series yet
                 if (! newChart || ! newChart.nodes || newChart.nodes.length === 0) {
                     alert(Messages.strAddOneSeriesWarning);
                     return;

libraries/classes/Database/Designer/Common.php

@@ -152,7 +152,7 @@ public function getScriptContr(array $designerTables): array
             }
             $row = $this->relation->getForeigners($GLOBALS['db'], $val[0], '', 'foreign');
 
-            // We do not have access to the foreign keys if he user has partial access to the columns
+            // We do not have access to the foreign keys if the user has partial access to the columns
             if ($row !== false && isset($row['foreign_keys_data'])) {
                 foreach ($row['foreign_keys_data'] as $one_key) {
                     foreach ($one_key['index_list'] as $index => $one_field) {

libraries/classes/Database/Qbe.php

@@ -1372,7 +1372,7 @@ private function _getMasterTable(
 
         // Now let's find out which of the tables has an index
         // (When the control user is the same as the normal user
-        // because he is using one of his databases as pmadb,
+        // because they are using one of their databases as pmadb,
         // the last db selected is not always the one where we need to work)
         $candidate_columns = $this->_getLeftJoinColumnCandidates(
             $search_tables,

libraries/classes/Database/Search.php

@@ -229,7 +229,7 @@ private function getWhereClause($table)
         $automatic_wildcard   = (($this->criteriaSearchType < 4) ? '%' : '');
         // For "as regular expression" (search option 5), LIKE won't be used
         // Usage example: If user is searching for a literal $ in a regexp search,
-        // he should enter \$ as the value.
+        // they should enter \$ as the value.
         $criteriaSearchStringEscaped = $this->dbi->escapeString(
             $this->criteriaSearchString
         );

libraries/classes/Plugins/Auth/AuthenticationHttp.php

@@ -153,7 +153,7 @@ public function readCredentials()
         unset($GLOBALS['PHP_AUTH_PW'], $_SERVER['PHP_AUTH_PW']);
 
         // Decode possibly encoded information (used by IIS/CGI/FastCGI)
-        // (do not use explode() because a user might have a colon in his password
+        // (do not use explode() because a user might have a colon in their password
         if (strcmp(substr($this->user, 0, 6), 'Basic ') == 0) {
             $usr_pass = base64_decode(substr($this->user, 6));
             if (! empty($usr_pass)) {

libraries/classes/Server/Privileges.php

@@ -2406,7 +2406,7 @@ public function updatePrivileges($username, $hostname, $tablename, $dbname, $ite
         }
         if (! $this->dbi->tryQuery($sql_query0)) {
             // This might fail when the executing user does not have
-            // ALL PRIVILEGES himself.
+            // ALL PRIVILEGES themselves.
             // See https://github.com/phpmyadmin/phpmyadmin/issues/9673
             $sql_query0 = '';
         }

libraries/classes/Util.php

@@ -3939,7 +3939,7 @@ public static function getFunctionsForField(array $field, $insert_mode, array $f
 
     /**
      * Checks if the current user has a specific privilege and returns true if the
-     * user indeed has that privilege or false if (s)he doesn't. This function must
+     * user indeed has that privilege or false if they don't. This function must
      * only be used for features that are available since MySQL 5, because it
      * relies on the INFORMATION_SCHEMA database to be present.
      *

libraries/entry_points/import.php

@@ -471,7 +471,7 @@
 
     /*
      * Do not allow symlinks to avoid security issues
-     * (user can create symlink to file he can not access,
+     * (user can create symlink to file they can not access,
      * but phpMyAdmin can).
      */
     if (@is_link($import_file)) {

libraries/entry_points/server/privileges.php

@@ -175,7 +175,7 @@
 ) = $serverPrivileges->getDataForDBInfo();
 
 /**
- * Checks if the user is allowed to do what he tries to...
+ * Checks if the user is allowed to do what they try to...
  */
 if (! $dbi->isSuperuser() && ! $GLOBALS['is_grantuser']
     && ! $GLOBALS['is_createuser']

libraries/entry_points/user_password.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * displays and handles the form where the user can change his password
+ * displays and handles the form where the user can change their password
  * linked from index.php
  *
  * @package PhpMyAdmin

sql/create_tables.sql

@@ -4,7 +4,7 @@
 -- This file is meant for use with MySQL 5 and above!
 --
 -- This script expects the user pma to already be existing. If we would put a
--- line here to create him too many users might just use this script and end
+-- line here to create them too many users might just use this script and end
 -- up with having the same password for the controluser.
 --
 -- This user "pma" must be defined in config.inc.php (controluser/controlpass)