WordPress.org

Make WordPress Core


Ignore:
Timestamp:
08/22/2017 11:51:11 AM (3 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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-admin/includes/network.php

    r38323 r41289  
    2828
    2929/**
    30  * Allow subdomain install
     30 * Allow subdomain installation
    3131 *
    3232 * @since 3.0.0
    33  * @return bool Whether subdomain install is allowed
     33 * @return bool Whether subdomain installation is allowed
    3434 */
    3535function allow_subdomain_install() {
     
    4242
    4343/**
    44  * Allow subdirectory install.
     44 * Allow subdirectory installation.
    4545 *
    4646 * @since 3.0.0
     
    4848 * @global wpdb $wpdb WordPress database abstraction object.
    4949 *
    50  * @return bool Whether subdirectory install is allowed
     50 * @return bool Whether subdirectory installation is allowed
    5151 */
    5252function allow_subdirectory_install() {
    5353    global $wpdb;
    5454        /**
    55          * Filters whether to enable the subdirectory install feature in Multisite.
     55         * Filters whether to enable the subdirectory installation feature in Multisite.
    5656         *
    5757         * @since 3.0.0
    5858         *
    59          * @param bool $allow Whether to enable the subdirectory install feature in Multisite. Default is false.
     59         * @param bool $allow Whether to enable the subdirectory installation feature in Multisite. Default is false.
    6060         */
    6161    if ( apply_filters( 'allow_subdirectory_install', false ) )
     
    258258        <?php if ( 'localhost' == $hostname ) : ?>
    259259            <tr>
    260                 <th scope="row"><?php esc_html_e( 'Sub-directory Install' ); ?></th>
     260                <th scope="row"><?php esc_html_e( 'Sub-directory Installation' ); ?></th>
    261261                <td><?php
    262262                    printf(
     
    268268                    // Uh oh:
    269269                    if ( !allow_subdirectory_install() )
    270                         echo ' <strong>' . __( 'Warning!' ) . ' ' . __( 'The main site in a sub-directory install will need to use a modified permalink structure, potentially breaking existing links.' ) . '</strong>';
     270                        echo ' <strong>' . __( 'Warning!' ) . ' ' . __( 'The main site in a sub-directory installation will need to use a modified permalink structure, potentially breaking existing links.' ) . '</strong>';
    271271                ?></td>
    272272            </tr>
    273273        <?php elseif ( !allow_subdomain_install() ) : ?>
    274274            <tr>
    275                 <th scope="row"><?php esc_html_e( 'Sub-directory Install' ); ?></th>
     275                <th scope="row"><?php esc_html_e( 'Sub-directory Installation' ); ?></th>
    276276                <td><?php
    277                     _e( 'Because your install is in a directory, the sites in your WordPress network must use sub-directories.' );
     277                    _e( 'Because your installation is in a directory, the sites in your WordPress network must use sub-directories.' );
    278278                    // Uh oh:
    279279                    if ( !allow_subdirectory_install() )
    280                         echo ' <strong>' . __( 'Warning!' ) . ' ' . __( 'The main site in a sub-directory install will need to use a modified permalink structure, potentially breaking existing links.' ) . '</strong>';
     280                        echo ' <strong>' . __( 'Warning!' ) . ' ' . __( 'The main site in a sub-directory installation will need to use a modified permalink structure, potentially breaking existing links.' ) . '</strong>';
    281281                ?></td>
    282282            </tr>
    283283        <?php elseif ( !allow_subdirectory_install() ) : ?>
    284284            <tr>
    285                 <th scope="row"><?php esc_html_e( 'Sub-domain Install' ); ?></th>
    286                 <td><?php _e( 'Because your install is not new, the sites in your WordPress network must use sub-domains.' );
    287                     echo ' <strong>' . __( 'The main site in a sub-directory install will need to use a modified permalink structure, potentially breaking existing links.' ) . '</strong>';
     285                <th scope="row"><?php esc_html_e( 'Sub-domain Installation' ); ?></th>
     286                <td><?php _e( 'Because your installation is not new, the sites in your WordPress network must use sub-domains.' );
     287                    echo ' <strong>' . __( 'The main site in a sub-directory installation will need to use a modified permalink structure, potentially breaking existing links.' ) . '</strong>';
    288288                ?></td>
    289289            </tr>
Note: See TracChangeset for help on using the changeset viewer.