Changeset 41289 for trunk/src/wp-admin/includes/network.php

Timestamp:

08/22/2017 11:51:11 AM (7 years ago)

Author:

johnbillion

Message:

General: Improve terminology used when referring to installations of WordPress and its extensions.

"Install" is not a noun, and while it might be acceptable to use the verb as a noun, it is not correct. Using the correct
noun, "installation", increases clarity, especially for non-native English speakers.

This change fixes the usage in user-facing text and in developer documentation.

Fixes #41620

File:

• trunk/src/wp-admin/includes/network.php (modified) (5 diffs)

trunk/src/wp-admin/includes/network.php

@@ -28 +28 @@
 
 /**
- * Allow subdomain install
+ * Allow subdomain installation
  *
  * @since 3.0.0
- * @return bool Whether subdomain install is allowed
+ * @return bool Whether subdomain installation is allowed
  */
 function allow_subdomain_install() {
@@ -42 +42 @@
 
 /**
- * Allow subdirectory install.
+ * Allow subdirectory installation.
  *
  * @since 3.0.0
@@ -48 +48 @@
  * @global wpdb $wpdb WordPress database abstraction object.
  *
- * @return bool Whether subdirectory install is allowed
+ * @return bool Whether subdirectory installation is allowed
  */
 function allow_subdirectory_install() {
     global $wpdb;
         /**
-         * Filters whether to enable the subdirectory install feature in Multisite.
+         * Filters whether to enable the subdirectory installation feature in Multisite.
          *
          * @since 3.0.0
          *
-         * @param bool $allow Whether to enable the subdirectory install feature in Multisite. Default is false.
+         * @param bool $allow Whether to enable the subdirectory installation feature in Multisite. Default is false.
          */
     if ( apply_filters( 'allow_subdirectory_install', false ) )
@@ -258 +258 @@
         <?php if ( 'localhost' == $hostname ) : ?>
             <tr>
-                <th scope="row"><?php esc_html_e( 'Sub-directory Install' ); ?></th>
+                <th scope="row"><?php esc_html_e( 'Sub-directory Installation' ); ?></th>
                 <td><?php
                     printf(
@@ -268 +268 @@
                     // Uh oh:
                     if ( !allow_subdirectory_install() )
-                        echo ' <strong>' . __( 'Warning!' ) . ' ' . __( 'The main site in a sub-directory install will need to use a modified permalink structure, potentially breaking existing links.' ) . '</strong>';
+                        echo ' <strong>' . __( 'Warning!' ) . ' ' . __( 'The main site in a sub-directory installation will need to use a modified permalink structure, potentially breaking existing links.' ) . '</strong>';
                 ?></td>
             </tr>
         <?php elseif ( !allow_subdomain_install() ) : ?>
             <tr>
-                <th scope="row"><?php esc_html_e( 'Sub-directory Install' ); ?></th>
+                <th scope="row"><?php esc_html_e( 'Sub-directory Installation' ); ?></th>
                 <td><?php
-                    _e( 'Because your install is in a directory, the sites in your WordPress network must use sub-directories.' );
+                    _e( 'Because your installation is in a directory, the sites in your WordPress network must use sub-directories.' );
                     // Uh oh:
                     if ( !allow_subdirectory_install() )
-                        echo ' <strong>' . __( 'Warning!' ) . ' ' . __( 'The main site in a sub-directory install will need to use a modified permalink structure, potentially breaking existing links.' ) . '</strong>';
+                        echo ' <strong>' . __( 'Warning!' ) . ' ' . __( 'The main site in a sub-directory installation will need to use a modified permalink structure, potentially breaking existing links.' ) . '</strong>';
                 ?></td>
             </tr>
         <?php elseif ( !allow_subdirectory_install() ) : ?>
             <tr>
-                <th scope="row"><?php esc_html_e( 'Sub-domain Install' ); ?></th>
-                <td><?php _e( 'Because your install is not new, the sites in your WordPress network must use sub-domains.' );
-                    echo ' <strong>' . __( 'The main site in a sub-directory install will need to use a modified permalink structure, potentially breaking existing links.' ) . '</strong>';
+                <th scope="row"><?php esc_html_e( 'Sub-domain Installation' ); ?></th>
+                <td><?php _e( 'Because your installation is not new, the sites in your WordPress network must use sub-domains.' );
+                    echo ' <strong>' . __( 'The main site in a sub-directory installation will need to use a modified permalink structure, potentially breaking existing links.' ) . '</strong>';
                 ?></td>
             </tr>