WordPress.org

Make WordPress Core

Changeset 41289


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

Location:
trunk
Files:
53 edited

Legend:

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

    r41270 r41289  
    34573457    /*
    34583458     * See WP_Theme_Install_List_Table::_get_theme_status() if we wanted to check
    3459      * on post-install status.
     3459     * on post-installation status.
    34603460     */
    34613461    wp_send_json_success( $status );
     
    37023702    $pagenow = isset( $_POST['pagenow'] ) ? sanitize_key( $_POST['pagenow'] ) : '';
    37033703
    3704     // If install request is coming from import page, do not return network activation link.
     3704    // If installation request is coming from import page, do not return network activation link.
    37053705    $plugins_url = ( 'import' === $pagenow ) ? admin_url( 'plugins.php' ) : network_admin_url( 'plugins.php' );
    37063706
  • trunk/src/wp-admin/includes/class-core-upgrader.php

    r41161 r41289  
    9696        /*
    9797         * If partial update is returned from the API, use that, unless we're doing
    98          * a reinstall. If we cross the new_bundled version number, then use
     98         * a reinstallation. If we cross the new_bundled version number, then use
    9999         * the new_bundled zip. Don't though if the constant is set to skip bundled items.
    100100         * If the API returns a no_content zip, go with it. Finally, default to the full zip.
  • trunk/src/wp-admin/includes/class-file-upload-upgrader.php

    r41161 r41289  
    8080            $this->id = wp_insert_attachment( $object, $file['file'] );
    8181
    82             // Schedule a cleanup for 2 hours from now in case of failed install.
     82            // Schedule a cleanup for 2 hours from now in case of failed installation.
    8383            wp_schedule_single_event( time() + 2 * HOUR_IN_SECONDS, 'upgrader_scheduled_cleanup', array( $this->id ) );
    8484
  • trunk/src/wp-admin/includes/class-language-pack-upgrader.php

    r41161 r41289  
    2929
    3030    /**
    31      * Whether a bulk upgrade/install is being performed.
     31     * Whether a bulk upgrade/installation is being performed.
    3232     *
    3333     * @since 3.7.0
     
    6161
    6262        /*
    63          * Avoid messing with VCS installs, at least for now.
     63         * Avoid messing with VCS installations, at least for now.
    6464         * Noted: this is not the ideal way to accomplish this.
    6565         */
  • trunk/src/wp-admin/includes/class-plugin-upgrader.php

    r41161 r41289  
    3232
    3333    /**
    34      * Whether a bulk upgrade/install is being performed.
     34     * Whether a bulk upgrade/installation is being performed.
    3535     *
    3636     * @since 2.9.0
     
    5757
    5858    /**
    59      * Initialize the install strings.
     59     * Initialize the installation strings.
    6060     *
    6161     * @since 2.8.0
    6262     */
    6363    public function install_strings() {
    64         $this->strings['no_package'] = __('Install package not available.');
    65         $this->strings['downloading_package'] = __('Downloading install package from <span class="code">%s</span>&#8230;');
     64        $this->strings['no_package'] = __('Installation package not available.');
     65        $this->strings['downloading_package'] = __('Downloading installation package from <span class="code">%s</span>&#8230;');
    6666        $this->strings['unpack_package'] = __('Unpacking the package&#8230;');
    6767        $this->strings['installing_package'] = __('Installing the plugin&#8230;');
    6868        $this->strings['no_files'] = __('The plugin contains no files.');
    69         $this->strings['process_failed'] = __('Plugin install failed.');
     69        $this->strings['process_failed'] = __('Plugin installation failed.');
    7070        $this->strings['process_success'] = __('Plugin installed successfully.');
    7171    }
     
    8484     *                                    Default true.
    8585     * }
    86      * @return bool|WP_Error True if the install was successful, false or a WP_Error otherwise.
     86     * @return bool|WP_Error True if the installation was successful, false or a WP_Error otherwise.
    8787     */
    8888    public function install( $package, $args = array() ) {
  • trunk/src/wp-admin/includes/class-theme-upgrader.php

    r41161 r41289  
    5555
    5656    /**
    57      * Initialize the install strings.
     57     * Initialize the installation strings.
    5858     *
    5959     * @since 2.8.0
    6060     */
    6161    public function install_strings() {
    62         $this->strings['no_package'] = __('Install package not available.');
    63         $this->strings['downloading_package'] = __('Downloading install package from <span class="code">%s</span>&#8230;');
     62        $this->strings['no_package'] = __('Installation package not available.');
     63        $this->strings['downloading_package'] = __('Downloading installation package from <span class="code">%s</span>&#8230;');
    6464        $this->strings['unpack_package'] = __('Unpacking the package&#8230;');
    6565        $this->strings['installing_package'] = __('Installing the theme&#8230;');
    6666        $this->strings['no_files'] = __('The theme contains no files.');
    67         $this->strings['process_failed'] = __('Theme install failed.');
     67        $this->strings['process_failed'] = __('Theme installation failed.');
    6868        $this->strings['process_success'] = __('Theme installed successfully.');
    6969        /* translators: 1: theme name, 2: version */
     
    111111        if ( ! $api || is_wp_error($api) ) {
    112112            $this->skin->feedback( 'parent_theme_not_found', $theme_info->get('Template') );
    113             // Don't show activate or preview actions after install
     113            // Don't show activate or preview actions after installation
    114114            add_filter('install_theme_complete_actions', array($this, 'hide_activate_preview_actions') );
    115115            return $install_result;
     
    181181     * }
    182182     *
    183      * @return bool|WP_Error True if the install was successful, false or a WP_Error object otherwise.
     183     * @return bool|WP_Error True if the installation was successful, false or a WP_Error object otherwise.
    184184     */
    185185    public function install( $package, $args = array() ) {
  • trunk/src/wp-admin/includes/class-wp-automatic-updater.php

    r41161 r41289  
    444444        }
    445445
    446         // Send debugging email to all development installs.
     446        // Send debugging email to admin for all development installations.
    447447        if ( ! empty( $this->update_results ) ) {
    448448            $development_version = false !== strpos( get_bloginfo( 'version' ), '-' );
  • trunk/src/wp-admin/includes/class-wp-ms-sites-list-table.php

    r41200 r41289  
    552552         * @param int    $blog_id  The site ID.
    553553         * @param string $blogname Site path, formatted depending on whether it is a sub-domain
    554          *                         or subdirectory multisite install.
     554         *                         or subdirectory multisite installation.
    555555         */
    556556        $actions = apply_filters( 'manage_sites_action_links', array_filter( $actions ), $blog['blog_id'], $blogname );
  • trunk/src/wp-admin/includes/class-wp-plugin-install-list-table.php

    r41161 r41289  
    560560                    <?php
    561561                    if ( $plugin['active_installs'] >= 1000000 ) {
    562                         $active_installs_text = _x( '1+ Million', 'Active plugin installs' );
     562                        $active_installs_text = _x( '1+ Million', 'Active plugin installations' );
    563563                    } elseif ( 0 == $plugin['active_installs'] ) {
    564                         $active_installs_text = _x( 'Less Than 10', 'Active plugin installs' );
     564                        $active_installs_text = _x( 'Less Than 10', 'Active plugin installations' );
    565565                    } else {
    566566                        $active_installs_text = number_format_i18n( $plugin['active_installs'] ) . '+';
    567567                    }
    568                     printf( __( '%s Active Installs' ), $active_installs_text );
     568                    printf( __( '%s Active Installations' ), $active_installs_text );
    569569                    ?>
    570570                </div>
  • trunk/src/wp-admin/includes/class-wp-upgrader.php

    r41168 r41289  
    8080     *      @type string $source             The full path to the source the files were installed from.
    8181     *      @type string $source_files       List of all the files in the source directory.
    82      *      @type string $destination        The full path to the install destination folder.
     82     *      @type string $destination        The full path to the installation destination folder.
    8383     *      @type string $destination_name   The name of the destination folder, or empty if `$destination`
    8484     *                                       and `$local_destination` are the same.
     
    571571
    572572        /**
    573          * Filters the install response after the installation has finished.
     573         * Filters the installation response after the installation has finished.
    574574         *
    575575         * @since 2.8.0
    576576         *
    577          * @param bool  $response   Install response.
     577         * @param bool  $response   Installation response.
    578578         * @param array $hook_extra Extra arguments passed to hooked filters.
    579579         * @param array $result     Installation result data.
     
    591591
    592592    /**
    593      * Run an upgrade/install.
     593     * Run an upgrade/installation.
    594594     *
    595595     * Attempts to download the package (if it is not a local file), unpack it, and
     
    613613     *                                               folder already exists. When true, `$clear_destination`
    614614     *                                               should be false. Default true.
    615      *     @type bool   $is_multi                    Whether this run is one of multiple upgrade/install
     615     *     @type bool   $is_multi                    Whether this run is one of multiple upgrade/installation
    616616     *                                               actions being performed in bulk. When true, the skin
    617617     *                                               WP_Upgrader::header() and WP_Upgrader::footer()
     
    736736            $this->skin->feedback('process_failed');
    737737        } else {
    738             // Install succeeded.
     738            // Installation succeeded.
    739739            $this->skin->feedback('process_success');
    740740        }
  • trunk/src/wp-admin/includes/ms.php

    r41254 r41289  
    629629 * Avoids a collision between a site slug and a permalink slug.
    630630 *
    631  * In a subdirectory install this will make sure that a site and a post do not use the
     631 * In a subdirectory installation this will make sure that a site and a post do not use the
    632632 * same subdirectory by checking for a site with the same name as a new post.
    633633 *
  • 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>
  • trunk/src/wp-admin/includes/plugin-install.php

    r40633 r41289  
    2020 *
    2121 * The second filter, {@see 'plugins_api'}, allows a plugin to override the WordPress.org
    22  * Plugin Install API entirely. If `$action` is 'query_plugins' or 'plugin_information',
     22 * Plugin Installation API entirely. If `$action` is 'query_plugins' or 'plugin_information',
    2323 * an object MUST be passed. If `$action` is 'hot_tags' or 'hot_categories', an array MUST
    2424 * be passed.
     
    9090 *         @type bool $banners           Whether to return the banner images links. Default false.
    9191 *         @type bool $icons             Whether to return the icon links. Default false.
    92  *         @type bool $active_installs   Whether to return the number of active installs. Default false.
     92 *         @type bool $active_installs   Whether to return the number of active installations. Default false.
    9393 *         @type bool $group             Whether to return the assigned group. Default false.
    9494 *         @type bool $contributors      Whether to return the list of contributors. Default false.
     
    114114
    115115    /**
    116      * Filters the WordPress.org Plugin Install API arguments.
     116     * Filters the WordPress.org Plugin Installation API arguments.
    117117     *
    118118     * Important: An object MUST be returned to this filter.
     
    121121     *
    122122     * @param object $args   Plugin API arguments.
    123      * @param string $action The type of information being requested from the Plugin Install API.
     123     * @param string $action The type of information being requested from the Plugin Installation API.
    124124     */
    125125    $args = apply_filters( 'plugins_api_args', $args, $action );
    126126
    127127    /**
    128      * Filters the response for the current WordPress.org Plugin Install API request.
     128     * Filters the response for the current WordPress.org Plugin Installation API request.
    129129     *
    130130     * Passing a non-false value will effectively short-circuit the WordPress.org API request.
     
    136136     *
    137137     * @param false|object|array $result The result object or array. Default false.
    138      * @param string             $action The type of information being requested from the Plugin Install API.
     138     * @param string             $action The type of information being requested from the Plugin Installation API.
    139139     * @param object             $args   Plugin API arguments.
    140140     */
     
    194194
    195195    /**
    196      * Filters the Plugin Install API response results.
     196     * Filters the Plugin Installation API response results.
    197197     *
    198198     * @since 2.7.0
    199199     *
    200200     * @param object|WP_Error $res    Response object or WP_Error.
    201      * @param string          $action The type of information being requested from the Plugin Install API.
     201     * @param string          $action The type of information being requested from the Plugin Installation API.
    202202     * @param object          $args   Plugin API arguments.
    203203     */
     
    516516    }
    517517
    518     iframe_header( __( 'Plugin Install' ) );
     518    iframe_header( __( 'Plugin Installation' ) );
    519519
    520520    $_with_banner = '';
     
    588588                <li><strong><?php _e( 'Compatible up to:' ); ?></strong> <?php echo $api->tested; ?></li>
    589589            <?php } if ( isset( $api->active_installs ) ) { ?>
    590                 <li><strong><?php _e( 'Active Installs:' ); ?></strong> <?php
     590                <li><strong><?php _e( 'Active Installations:' ); ?></strong> <?php
    591591                    if ( $api->active_installs >= 1000000 ) {
    592                         _ex( '1+ Million', 'Active plugin installs' );
     592                        _ex( '1+ Million', 'Active plugin installations' );
    593593                    } elseif ( 0 == $api->active_installs ) {
    594                         _ex( 'Less Than 10', 'Active plugin installs' );
     594                        _ex( 'Less Than 10', 'Active plugin installations' );
    595595                    } else {
    596596                        echo number_format_i18n( $api->active_installs ) . '+';
  • trunk/src/wp-admin/includes/plugin.php

    r40967 r41289  
    420420        'db.php'             => array( __( 'Custom database class.'         ), true ), // auto on load
    421421        'db-error.php'       => array( __( 'Custom database error message.' ), true ), // auto on error
    422         'install.php'        => array( __( 'Custom install script.'         ), true ), // auto on install
     422        'install.php'        => array( __( 'Custom installation script.'    ), true ), // auto on installation
    423423        'maintenance.php'    => array( __( 'Custom maintenance message.'    ), true ), // auto on maintenance
    424424        'object-cache.php'   => array( __( 'External object cache.'         ), true ), // auto on load
  • trunk/src/wp-admin/includes/schema.php

    r40406 r41289  
    891891 * @param string $site_name         The name of the network.
    892892 * @param string $path              Optional. The path to append to the network's domain name. Default '/'.
    893  * @param bool   $subdomain_install Optional. Whether the network is a subdomain install or a subdirectory install.
    894  *                                  Default false, meaning the network is a subdirectory install.
    895  * @return bool|WP_Error True on success, or WP_Error on warning (with the install otherwise successful,
     893 * @param bool   $subdomain_install Optional. Whether the network is a subdomain installation or a subdirectory installation.
     894 *                                  Default false, meaning the network is a subdirectory installation.
     895 * @return bool|WP_Error True on success, or WP_Error on warning (with the installation otherwise successful,
    896896 *                       so the error code must be checked) or failure.
    897897 */
  • trunk/src/wp-admin/includes/theme-install.php

    r38672 r41289  
    11<?php
    22/**
    3  * WordPress Theme Install Administration API
     3 * WordPress Theme Installation Administration API
    44 *
    55 * @package WordPress
     
    203203        wp_die( $theme );
    204204
    205     iframe_header( __('Theme Install') );
     205    iframe_header( __('Theme Installation') );
    206206    if ( ! isset( $wp_list_table ) ) {
    207207        $wp_list_table = _get_list_table('WP_Theme_Install_List_Table');
  • trunk/src/wp-admin/includes/translation-install.php

    r40638 r41289  
    11<?php
    22/**
    3  * WordPress Translation Install Administration API
     3 * WordPress Translation Installation Administration API
    44 *
    55 * @package WordPress
     
    2525
    2626    /**
    27      * Allows a plugin to override the WordPress.org Translation Install API entirely.
     27     * Allows a plugin to override the WordPress.org Translation Installation API entirely.
    2828     *
    2929     * @since 4.0.0
     
    9494
    9595    /**
    96      * Filters the Translation Install API response results.
     96     * Filters the Translation Installation API response results.
    9797     *
    9898     * @since 4.0.0
  • trunk/src/wp-admin/includes/update-core.php

    r40879 r41289  
    11981198 * Redirect to the About WordPress page after a successful upgrade.
    11991199 *
    1200  * This function is only needed when the existing install is older than 3.4.0.
     1200 * This function is only needed when the existing installation is older than 3.4.0.
    12011201 *
    12021202 * @since 3.3.0
  • trunk/src/wp-admin/includes/update.php

    r40575 r41289  
    6464 * Gets the best available (and enabled) Auto-Update for WordPress Core.
    6565 *
    66  * If there's 1.2.3 and 1.3 on offer, it'll choose 1.3 if the install allows it, else, 1.2.3
     66 * If there's 1.2.3 and 1.3 on offer, it'll choose 1.3 if the installation allows it, else, 1.2.3
    6767 *
    6868 * @since 3.7.0
     
    597597        /*
    598598         * If an update failed critically, we may have copied over version.php but not other files.
    599          * In that case, if the install claims we're running the version we attempted, nag.
     599         * In that case, if the installation claims we're running the version we attempted, nag.
    600600         * This is serious enough to err on the side of nagging.
    601601         *
  • trunk/src/wp-admin/includes/upgrade.php

    r40864 r41289  
    99 */
    1010
    11 /** Include user install customize script. */
     11/** Include user installation customization script. */
    1212if ( file_exists(WP_CONTENT_DIR . '/install.php') )
    1313    require (WP_CONTENT_DIR . '/install.php');
     
    9696    flush_rewrite_rules();
    9797
    98     wp_new_blog_notification($blog_title, $guessurl, $user_id, ($email_password ? $user_password : __('The password you chose during the install.') ) );
     98    wp_new_blog_notification($blog_title, $guessurl, $user_id, ($email_password ? $user_password : __('The password you chose during installation.') ) );
    9999
    100100    wp_cache_flush();
     
    286286
    287287/**
    288  * Maybe enable pretty permalinks on install.
     288 * Maybe enable pretty permalinks on installation.
    289289 *
    290290 * If after enabling pretty permalinks don't work, fallback to query-string permalinks.
     
    453453
    454454/**
    455  * Functions to be called in install and upgrade scripts.
     455 * Functions to be called in installation and upgrade scripts.
    456456 *
    457457 * Contains conditional checks to determine which upgrade scripts to run,
     
    20612061
    20622062/**
    2063  * Utility version of get_option that is private to install/upgrade.
     2063 * Utility version of get_option that is private to installation/upgrade.
    20642064 *
    20652065 * @ignore
  • trunk/src/wp-admin/install.php

    r41030 r41289  
    5050
    5151/**
    52  * Display install header.
     52 * Display installation header.
    5353 *
    5454 * @since 2.5.0
  • trunk/src/wp-admin/network.php

    r40390 r41289  
    5858
    5959$network_help = '<p>' . __('This screen allows you to configure a network as having subdomains (<code>site1.example.com</code>) or subdirectories (<code>example.com/site1</code>). Subdomains require wildcard subdomains to be enabled in Apache and DNS records, if your host allows it.') . '</p>' .
    60     '<p>' . __('Choose subdomains or subdirectories; this can only be switched afterwards by reconfiguring your install. Fill out the network details, and click install. If this does not work, you may have to add a wildcard DNS record (for subdomains) or change to another setting in Permalinks (for subdirectories).') . '</p>' .
     60    '<p>' . __('Choose subdomains or subdirectories; this can only be switched afterwards by reconfiguring your installation. Fill out the network details, and click Install. If this does not work, you may have to add a wildcard DNS record (for subdomains) or change to another setting in Permalinks (for subdirectories).') . '</p>' .
    6161    '<p>' . __('The next screen for Network Setup will give you individually-generated lines of code to add to your wp-config.php and .htaccess files. Make sure the settings of your FTP client make files starting with a dot visible, so that you can find .htaccess; you may have to create this file if it really is not there. Make backup copies of those two files.') . '</p>' .
    6262    '<p>' . __('Add the designated lines of code to wp-config.php (just before <code>/*...stop editing...*/</code>) and <code>.htaccess</code> (replacing the existing WordPress rules).') . '</p>' .
  • trunk/src/wp-admin/network/settings.php

    r41268 r41289  
    1111require_once( dirname( __FILE__ ) . '/admin.php' );
    1212
    13 /** WordPress Translation Install API */
     13/** WordPress Translation Installation API */
    1414require_once( ABSPATH . 'wp-admin/includes/translation-install.php' );
    1515
     
    6363    );
    6464
    65     // Handle translation install.
     65    // Handle translation installation.
    6666    if ( ! empty( $_POST['WPLANG'] ) && current_user_can( 'install_languages' ) ) {
    6767        $language = wp_download_language_pack( $_POST['WPLANG'] );
  • trunk/src/wp-admin/network/site-new.php

    r41268 r41289  
    1111require_once( dirname( __FILE__ ) . '/admin.php' );
    1212
    13 /** WordPress Translation Install API */
     13/** WordPress Translation Installation API */
    1414require_once( ABSPATH . 'wp-admin/includes/translation-install.php' );
    1515
     
    4343        $domain = strtolower( $blog['domain'] );
    4444
    45     // If not a subdomain install, make sure the domain isn't a reserved word
     45    // If not a subdomain installation, make sure the domain isn't a reserved word
    4646    if ( ! is_subdomain_install() ) {
    4747        $subdirectory_reserved_names = get_subdirectory_reserved_names();
     
    6363    );
    6464
    65     // Handle translation install for the new site.
     65    // Handle translation installation for the new site.
    6666    if ( isset( $_POST['WPLANG'] ) ) {
    6767        if ( '' === $_POST['WPLANG'] ) {
  • trunk/src/wp-admin/options-general.php

    r41268 r41289  
    1010require_once( dirname( __FILE__ ) . '/admin.php' );
    1111
    12 /** WordPress Translation Install API */
     12/** WordPress Translation Installation API */
    1313require_once( ABSPATH . 'wp-admin/includes/translation-install.php' );
    1414
  • trunk/src/wp-admin/options-writing.php

    r38720 r41289  
    2828        'id'      => 'options-postemail',
    2929        'title'   => __( 'Post Via Email' ),
    30         'content' => '<p>' . __( 'Post via email settings allow you to send your WordPress install an email with the content of your post. You must set up a secret email account with POP3 access to use this, and any mail received at this address will be posted, so it&#8217;s a good idea to keep this address very secret.' ) . '</p>',
     30        'content' => '<p>' . __( 'Post via email settings allow you to send your WordPress installation an email with the content of your post. You must set up a secret email account with POP3 access to use this, and any mail received at this address will be posted, so it&#8217;s a good idea to keep this address very secret.' ) . '</p>',
    3131    ) );
    3232}
  • trunk/src/wp-admin/options.php

    r41268 r41289  
    177177        }
    178178
    179         // Handle translation install.
     179        // Handle translation installation.
    180180        if ( ! empty( $_POST['WPLANG'] ) && current_user_can( 'install_languages' ) ) {
    181181            require_once( ABSPATH . 'wp-admin/includes/translation-install.php' );
  • trunk/src/wp-admin/plugin-install.php

    r39536 r41289  
    6868
    6969/*
    70  * Call the pre upload action on every non-upload plugin install screen
     70 * Call the pre upload action on every non-upload plugin installation screen
    7171 * because the form is always displayed on these screens.
    7272 */
     
    130130<?php
    131131/*
    132  * Output the upload plugin form on every non-upload plugin install screen, so it can be
     132 * Output the upload plugin form on every non-upload plugin installation screen, so it can be
    133133 * displayed via JavaScript rather then opening up the devoted upload plugin page.
    134134 */
  • trunk/src/wp-admin/setup-config.php

    r38899 r41289  
    3636require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
    3737
    38 /** Load WordPress Translation Install API */
     38/** Load WordPress Translation Installation API */
    3939require_once( ABSPATH . 'wp-admin/includes/translation-install.php' );
    4040
     
    5858    );
    5959
    60 // Check if wp-config.php exists above the root directory but is not part of another install
     60// Check if wp-config.php exists above the root directory but is not part of another installation
    6161if ( @file_exists( ABSPATH . '../wp-config.php' ) && ! @file_exists( ABSPATH . '../wp-settings.php' ) ) {
    6262    wp_die( '<p>' . sprintf(
     
    369369        }
    370370?></textarea>
    371 <p><?php _e( 'After you&#8217;ve done that, click &#8220;Run the install.&#8221;' ); ?></p>
    372 <p class="step"><a href="<?php echo $install; ?>" class="button button-large"><?php _e( 'Run the install' ); ?></a></p>
     371<p><?php _e( 'After you&#8217;ve done that, click &#8220;Run the installation.&#8221;' ); ?></p>
     372<p class="step"><a href="<?php echo $install; ?>" class="button button-large"><?php _e( 'Run the installation' ); ?></a></p>
    373373<script>
    374374(function(){
     
    402402<p><?php _e( 'All right, sparky! You&#8217;ve made it through this part of the installation. WordPress can now communicate with your database. If you are ready, time now to&hellip;' ); ?></p>
    403403
    404 <p class="step"><a href="<?php echo $install; ?>" class="button button-large"><?php _e( 'Run the install' ); ?></a></p>
     404<p class="step"><a href="<?php echo $install; ?>" class="button button-large"><?php _e( 'Run the installation' ); ?></a></p>
    405405<?php
    406406    endif;
  • trunk/src/wp-admin/theme-install.php

    r40636 r41289  
    7777     *
    7878     * The dynamic portion of the hook name, `$tab`, refers to the current
    79      * theme install tab. Possible values are 'dashboard', 'search', 'upload',
     79     * theme installation tab. Possible values are 'dashboard', 'search', 'upload',
    8080     * 'featured', 'new', or 'updated'.
    8181     *
     
    237237     *
    238238     * The dynamic portion of the hook name, `$tab`, refers to the current
    239      * theme install tab. Possible values are 'dashboard', 'search', 'upload',
     239     * theme installation tab. Possible values are 'dashboard', 'search', 'upload',
    240240     * 'featured', 'new', or 'updated'.
    241241     *
  • trunk/src/wp-admin/update.php

    r38470 r41289  
    121121        }
    122122
    123         $title = __('Plugin Install');
     123        $title = __('Plugin Installation');
    124124        $parent_file = 'plugins.php';
    125125        $submenu_file = 'plugin-install.php';
  • trunk/src/wp-includes/class-wp-customize-manager.php

    r41243 r41289  
    536536
    537537        /*
    538          * Import theme starter content for fresh installs when landing in the customizer.
     538         * Import theme starter content for fresh installations when landing in the customizer.
    539539         * Import starter content at after_setup_theme:100 so that any
    540540         * add_theme_support( 'starter-content' ) calls will have been made.
     
    17611761        $exported_setting_validities = array_map( array( $this, 'prepare_setting_validity_for_js' ), $setting_validities );
    17621762
    1763         // Note that the REQUEST_URI is not passed into home_url() since this breaks subdirectory installs.
     1763        // Note that the REQUEST_URI is not passed into home_url() since this breaks subdirectory installations.
    17641764        $self_url = empty( $_SERVER['REQUEST_URI'] ) ? home_url( '/' ) : esc_url_raw( wp_unslash( $_SERVER['REQUEST_URI'] ) );
    17651765        $state_query_params = array(
  • trunk/src/wp-includes/class-wp-locale-switcher.php

    r41162 r41289  
    159159
    160160    /**
    161      * Filters the WordPress install's locale.
    162      *
    163      * @since 4.7.0
    164      *
    165      * @param string $locale The WordPress install's locale.
     161     * Filters the locale of the WordPress installation.
     162     *
     163     * @since 4.7.0
     164     *
     165     * @param string $locale The locale of the WordPress installation.
    166166     * @return string The locale currently being switched to.
    167167     */
  • trunk/src/wp-includes/class-wp-network.php

    r41162 r41289  
    274274         *
    275275         * This is a very basic optimization; anything further could have
    276          * drawbacks depending on the setup, so this is best done per-install.
     276         * drawbacks depending on the setup, so this is best done per-installation.
    277277         */
    278278        $using_paths = true;
  • trunk/src/wp-includes/default-constants.php

    r40320 r41289  
    350350
    351351    /**
    352      * Slug of the default theme for this install.
     352     * Slug of the default theme for this installation.
    353353     * Used as the default theme when installing new sites.
    354354     * It will be used as the fallback if the current theme doesn't exist.
  • trunk/src/wp-includes/deprecated.php

    r41216 r41289  
    33733373 *
    33743374 * Checks to see if the user has deleted the tinymce files to slim down
    3375  * their WordPress install.
     3375 * their WordPress installation.
    33763376 *
    33773377 * @since 2.1.0
  • trunk/src/wp-includes/functions.php

    r41244 r41289  
    13891389
    13901390    /*
    1391      * Loop over the WP tables. If none exist, then scratch install is allowed.
     1391     * Loop over the WP tables. If none exist, then scratch installation is allowed.
    13921392     * If one or more exist, suggest table repair since we got here because the
    13931393     * options table could not be accessed.
     
    13951395    $wp_tables = $wpdb->tables();
    13961396    foreach ( $wp_tables as $table ) {
    1397         // The existence of custom user tables shouldn't suggest an insane state or prevent a clean install.
     1397        // The existence of custom user tables shouldn't suggest an insane state or prevent a clean installation.
    13981398        if ( defined( 'CUSTOM_USER_TABLE' ) && CUSTOM_USER_TABLE == $table )
    13991399            continue;
     
    43274327                // Request is hitting a file above ABSPATH
    43284328                $subdirectory = substr( $abspath_fix, strpos( $abspath_fix, $script_filename_dir ) + strlen( $script_filename_dir ) );
    4329                 // Strip off any file/query params from the path, appending the sub directory to the install
     4329                // Strip off any file/query params from the path, appending the sub directory to the installation
    43304330                $path = preg_replace( '#/[^/]*$#i', '' , $_SERVER['REQUEST_URI'] ) . $subdirectory;
    43314331            } else {
     
    44094409
    44104410/**
    4411  * Determine whether a network is the main network of the Multisite install.
     4411 * Determine whether a network is the main network of the Multisite installation.
    44124412 *
    44134413 * @since 3.7.0
  • trunk/src/wp-includes/l10n.php

    r40932 r41289  
    3333    if ( isset( $locale ) ) {
    3434        /**
    35          * Filters WordPress install's locale ID.
     35         * Filters the locale ID of the WordPress installation.
    3636         *
    3737         * @since 1.5.0
     
    980980 * properly translates them back.
    981981 *
    982  * The before_last_bar() call is needed, because older installs keep the roles
     982 * The before_last_bar() call is needed, because older installations keep the roles
    983983 * using the old context format: 'Role name|User role' and just skipping the
    984  * content after the last bar is easier than fixing them in the DB. New installs
     984 * content after the last bar is easier than fixing them in the DB. New installations
    985985 * won't suffer from that problem.
    986986 *
  • trunk/src/wp-includes/ms-deprecated.php

    r41242 r41289  
    461461 *     @type int       $offset     Exclude the first x sites. Used in combination with the $limit parameter. Default 0.
    462462 * }
    463  * @return array An empty array if the install is considered "large" via wp_is_large_network(). Otherwise,
     463 * @return array An empty array if the installation is considered "large" via wp_is_large_network(). Otherwise,
    464464 *               an associative array of site data arrays, each containing the site (network) ID, blog ID,
    465465 *               site domain and path, dates registered and modified, and the language ID. Also, boolean
  • trunk/src/wp-includes/ms-functions.php

    r41242 r41289  
    587587
    588588    /*
    589      * On sub dir installs, some names are so illegal, only a filter can
     589     * On sub dir installations, some names are so illegal, only a filter can
    590590     * spring them from jail.
    591591     */
     
    681681     *
    682682     *     @type string         $domain     Domain for the site.
    683      *     @type string         $path       Path for the site. Used in subdirectory installs.
     683     *     @type string         $path       Path for the site. Used in subdirectory installations.
    684684     *     @type string         $blogname   The unique site name (slug).
    685685     *     @type string         $blog_title Blog title.
     
    11651165 * for events that should affect all new sites.
    11661166 *
    1167  * On subdirectory installs, $domain is the same as the main site's
     1167 * On subdirectory installations, $domain is the same as the main site's
    11681168 * domain, and the path is the subdirectory name (eg 'example.com'
    1169  * and '/blog1/'). On subdomain installs, $domain is the new subdomain +
     1169 * and '/blog1/'). On subdomain installations, $domain is the new subdomain +
    11701170 * root domain (eg 'blog1.example.com'), and $path is '/'.
    11711171 *
     
    11811181 *                           updated. Otherwise, keys and values will be used to set options for
    11821182 *                           the new site. Default empty array.
    1183  * @param int    $network_id Optional. Network ID. Only relevant on multi-network installs.
     1183 * @param int    $network_id Optional. Network ID. Only relevant on multi-network installations.
    11841184 * @return int|WP_Error Returns WP_Error object on failure, the new site ID on success.
    11851185 */
     
    12411241     * @param string $domain     Site domain.
    12421242     * @param string $path       Site path.
    1243      * @param int    $network_id Network ID. Only relevant on multi-network installs.
     1243     * @param int    $network_id Network ID. Only relevant on multi-network installations.
    12441244     * @param array  $meta       Meta data. Used to set initial site options.
    12451245     */
     
    13531353 * @param string $domain     The domain to be checked.
    13541354 * @param string $path       The path to be checked.
    1355  * @param int    $network_id Optional. Network ID. Relevant only on multi-network installs.
     1355 * @param int    $network_id Optional. Network ID. Relevant only on multi-network installations.
    13561356 * @return int
    13571357 */
     
    13751375     * @param string   $domain     Domain to be checked.
    13761376     * @param string   $path       Path to be checked.
    1377      * @param int      $network_id Network ID. Relevant only on multi-network installs.
     1377     * @param int      $network_id Network ID. Relevant only on multi-network installations.
    13781378     */
    13791379    return apply_filters( 'domain_exists', $result, $domain, $path, $network_id );
     
    13921392 * @param string $domain     The domain of the new site.
    13931393 * @param string $path       The path of the new site.
    1394  * @param int    $network_id Unless you're running a multi-network install, be sure to set this value to 1.
     1394 * @param int    $network_id Unless you're running a multi-network installation, be sure to set this value to 1.
    13951395 * @return int|false The ID of the new row
    13961396 */
     
    25712571
    25722572/**
    2573  * Retrieves a list of reserved site on a sub-directory Multisite install.
     2573 * Retrieves a list of reserved site on a sub-directory Multisite installation.
    25742574 *
    25752575 * @since 4.4.0
     
    25842584
    25852585    /**
    2586      * Filters reserved site names on a sub-directory Multisite install.
     2586     * Filters reserved site names on a sub-directory Multisite installation.
    25872587     *
    25882588     * @since 3.0.0
  • trunk/src/wp-includes/ms-load.php

    r38943 r41289  
    309309    } elseif ( ! $subdomain ) {
    310310        /*
    311          * A "subdomain" install can be re-interpreted to mean "can support any domain".
    312          * If we're not dealing with one of these installs, then the important part is determining
     311         * A "subdomain" installation can be re-interpreted to mean "can support any domain".
     312         * If we're not dealing with one of these installations, then the important part is determining
    313313         * the network first, because we need the network's path to identify any sites.
    314314         */
     
    402402
    403403        if ( $subdomain && ! defined( 'NOBLOGREDIRECT' ) ) {
    404             // For a "subdomain" install, redirect to the signup form specifically.
     404            // For a "subdomain" installation, redirect to the signup form specifically.
    405405            $destination .= 'wp-signup.php?new=' . str_replace( '.' . $current_site->domain, '', $domain );
    406406        } elseif ( $subdomain ) {
    407             // For a "subdomain" install, the NOBLOGREDIRECT constant
     407            // For a "subdomain" installation, the NOBLOGREDIRECT constant
    408408            // can be used to avoid a redirect to the signup form.
    409409            // Using the ms_site_not_found action is preferred to the constant.
  • trunk/src/wp-includes/plugin.php

    r38589 r41289  
    781781 * registering the uninstall hook. In order to run using the hook, the plugin
    782782 * will have to be included, which means that any code laying outside of a
    783  * function will be run during the uninstall process. The plugin should not
    784  * hinder the uninstall process.
     783 * function will be run during the uninstallation process. The plugin should not
     784 * hinder the uninstallation process.
    785785 *
    786786 * If the plugin can not be written without running code within the plugin, then
    787787 * the plugin should create a file named 'uninstall.php' in the base plugin
    788  * folder. This file will be called, if it exists, during the uninstall process
     788 * folder. This file will be called, if it exists, during the uninstallation process
    789789 * bypassing the uninstall hook. The plugin, when using the 'uninstall.php'
    790790 * should always check for the 'WP_UNINSTALL_PLUGIN' constant, before
  • trunk/src/wp-includes/script-loader.php

    r41240 r41289  
    744744                'pluginInstalled'            => _x( 'Installed!', 'plugin' ),
    745745                'themeInstalled'             => _x( 'Installed!', 'theme' ),
    746                 'installFailedShort'         => __( 'Install Failed!' ),
     746                'installFailedShort'         => __( 'Installation Failed!' ),
    747747                /* translators: %s: Error string for a failed installation */
    748748                'installFailed'              => __( 'Installation failed: %s' ),
  • trunk/src/wp-includes/user.php

    r41272 r41289  
    13841384 * @since 2.0.0
    13851385 * @since 3.6.0 The `aim`, `jabber`, and `yim` fields were removed as default user contact
    1386  *              methods for new installs. See wp_get_user_contact_methods().
     1386 *              methods for new installations. See wp_get_user_contact_methods().
    13871387 * @since 4.7.0 The user's locale can be passed to `$userdata`.
    13881388 *
  • trunk/src/wp-load.php

    r38899 r41289  
    3939} elseif ( @file_exists( dirname( ABSPATH ) . '/wp-config.php' ) && ! @file_exists( dirname( ABSPATH ) . '/wp-settings.php' ) ) {
    4040
    41     /** The config file resides one level above ABSPATH but is not part of another install */
     41    /** The config file resides one level above ABSPATH but is not part of another installation */
    4242    require_once( dirname( ABSPATH ) . '/wp-config.php' );
    4343
  • trunk/src/wp-settings.php

    r40387 r41289  
    2323/*
    2424 * These can't be directly globalized in version.php. When updating,
    25  * we're including version.php from another install and don't want
     25 * we're including version.php from another installation and don't want
    2626 * these values to be overridden if already set.
    2727 */
  • trunk/tests/phpunit/includes/mock-fs.php

    r26246 r41289  
    2626        $folder = $this->find_folder( $path );
    2727
    28         // Perhaps the FTP folder is rooted at the WordPress install, Check for wp-includes folder in root, Could have some false positives, but rare.
     28        // Perhaps the FTP folder is rooted at the WordPress installation, Check for wp-includes folder in root, Could have some false positives, but rare.
    2929        if ( ! $folder && $this->is_dir('/wp-includes') )
    3030            $folder = '/';
  • trunk/tests/phpunit/includes/object-cache.php

    r40561 r41289  
    836836        /**
    837837         * This approach is borrowed from Sivel and Boren. Use the salt for easy cache invalidation and for
    838          * multi single WP installs on the same server.
     838         * multi single WP installations on the same server.
    839839         */
    840840        if ( ! defined( 'WP_CACHE_KEY_SALT' ) )
  • trunk/tests/phpunit/includes/trac.php

    r27168 r41289  
    33class TracTickets {
    44    /**
    5      * When open tickets for a Trac install is requested, the results are stored here.
     5     * When open tickets for a Trac installation is requested, the results are stored here.
    66     *
    77     * @var array
  • trunk/tests/phpunit/includes/utils.php

    r40555 r41289  
    140140
    141141// convert valid xml to an array tree structure
    142 // kinda lame but it works with a default php 4 install
     142// kinda lame but it works with a default php 4 installation
    143143class testXMLParser {
    144144    var $xml;
  • trunk/tests/phpunit/tests/filesystem/findFolder.php

    r41261 r41289  
    4949
    5050    /**
    51      * Two WordPress installs, with one contained within the other
     51     * Two WordPress installations, with one contained within the other
    5252     * FTP / = /var/www/example.com/ on Disk
    5353     * example.com at /
  • trunk/tests/phpunit/tests/http/base.php

    r40524 r41289  
    385385    function test_ssl() {
    386386        if ( ! wp_http_supports( array( 'ssl' ) ) )
    387             $this->fail( 'This install of PHP does not support SSL' );
     387            $this->fail( 'This installation of PHP does not support SSL' );
    388388
    389389        $res = wp_remote_get( 'https://wordpress.org/' );
  • trunk/wp-tests-config-sample.php

    r38858 r41289  
    88 *
    99 * The 'default' theme is symlinked from test/phpunit/data/themedir1/default into
    10  * the themes directory of the WordPress install defined above.
     10 * the themes directory of the WordPress installation defined above.
    1111 */
    1212define( 'WP_DEFAULT_THEME', 'default' );
Note: See TracChangeset for help on using the changeset viewer.