Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

Built from https://develop.svn.wordpress.org/trunk@41289


git-svn-id: http://core.svn.wordpress.org/trunk@41129 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
John Blackbourn 2017-08-22 11:52:48 +00:00
parent 9891448a42
commit 28eda6f4bc
47 changed files with 131 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-admin/includes/ajax-actions.php
View File

@ -3456,7 +3456,7 @@ function wp_ajax_install_theme() {
/*
* See WP_Theme_Install_List_Table::_get_theme_status() if we wanted to check
* on post-install status.
* on post-installation status.
*/
wp_send_json_success( $status );
}
@ -3701,7 +3701,7 @@ function wp_ajax_install_plugin() {
$install_status = install_plugin_install_status( $api );
$pagenow = isset( $_POST['pagenow'] ) ? sanitize_key( $_POST['pagenow'] ) : '';
// If install request is coming from import page, do not return network activation link.
// If installation request is coming from import page, do not return network activation link.
$plugins_url = ( 'import' === $pagenow ) ? admin_url( 'plugins.php' ) : network_admin_url( 'plugins.php' );
if ( current_user_can( 'activate_plugins' ) && is_plugin_inactive( $install_status['file'] ) ) {

2
wp-admin/includes/class-core-upgrader.php
View File

@ -95,7 +95,7 @@ class Core_Upgrader extends WP_Upgrader {
/*
* If partial update is returned from the API, use that, unless we're doing
* a reinstall. If we cross the new_bundled version number, then use
* a reinstallation. If we cross the new_bundled version number, then use
* the new_bundled zip. Don't though if the constant is set to skip bundled items.
* If the API returns a no_content zip, go with it. Finally, default to the full zip.
*/

2
wp-admin/includes/class-file-upload-upgrader.php
View File

@ -79,7 +79,7 @@ class File_Upload_Upgrader {
// Save the data.
$this->id = wp_insert_attachment( $object, $file['file'] );
// Schedule a cleanup for 2 hours from now in case of failed install.
// Schedule a cleanup for 2 hours from now in case of failed installation.
wp_schedule_single_event( time() + 2 * HOUR_IN_SECONDS, 'upgrader_scheduled_cleanup', array( $this->id ) );
} elseif ( is_numeric( $_GET[$urlholder] ) ) {

4
wp-admin/includes/class-language-pack-upgrader.php
View File

@ -28,7 +28,7 @@ class Language_Pack_Upgrader extends WP_Upgrader {
public $result;
/**
* Whether a bulk upgrade/install is being performed.
* Whether a bulk upgrade/installation is being performed.
*
* @since 3.7.0
* @var bool $bulk
@ -60,7 +60,7 @@ class Language_Pack_Upgrader extends WP_Upgrader {
}
/*
* Avoid messing with VCS installs, at least for now.
* Avoid messing with VCS installations, at least for now.
* Noted: this is not the ideal way to accomplish this.
*/
$check_vcs = new WP_Automatic_Updater;

12
wp-admin/includes/class-plugin-upgrader.php
View File

@ -31,7 +31,7 @@ class Plugin_Upgrader extends WP_Upgrader {
public $result;
/**
* Whether a bulk upgrade/install is being performed.
* Whether a bulk upgrade/installation is being performed.
*
* @since 2.9.0
* @var bool $bulk
@ -56,17 +56,17 @@ class Plugin_Upgrader extends WP_Upgrader {
}
/**
* Initialize the install strings.
* Initialize the installation strings.
*
* @since 2.8.0
*/
public function install_strings() {
$this->strings['no_package'] = __('Install package not available.');
$this->strings['downloading_package'] = __('Downloading install package from <span class="code">%s</span>&#8230;');
$this->strings['no_package'] = __('Installation package not available.');
$this->strings['downloading_package'] = __('Downloading installation package from <span class="code">%s</span>&#8230;');
$this->strings['unpack_package'] = __('Unpacking the package&#8230;');
$this->strings['installing_package'] = __('Installing the plugin&#8230;');
$this->strings['no_files'] = __('The plugin contains no files.');
$this->strings['process_failed'] = __('Plugin install failed.');
$this->strings['process_failed'] = __('Plugin installation failed.');
$this->strings['process_success'] = __('Plugin installed successfully.');
}
@ -83,7 +83,7 @@ class Plugin_Upgrader extends WP_Upgrader {
* @type bool $clear_update_cache Whether to clear the plugin updates cache if successful.
* Default true.
* }
* @return bool|WP_Error True if the install was successful, false or a WP_Error otherwise.
* @return bool|WP_Error True if the installation was successful, false or a WP_Error otherwise.
*/
public function install( $package, $args = array() ) {

12
wp-admin/includes/class-theme-upgrader.php
View File

@ -54,17 +54,17 @@ class Theme_Upgrader extends WP_Upgrader {
}
/**
* Initialize the install strings.
* Initialize the installation strings.
*
* @since 2.8.0
*/
public function install_strings() {
$this->strings['no_package'] = __('Install package not available.');
$this->strings['downloading_package'] = __('Downloading install package from <span class="code">%s</span>&#8230;');
$this->strings['no_package'] = __('Installation package not available.');
$this->strings['downloading_package'] = __('Downloading installation package from <span class="code">%s</span>&#8230;');
$this->strings['unpack_package'] = __('Unpacking the package&#8230;');
$this->strings['installing_package'] = __('Installing the theme&#8230;');
$this->strings['no_files'] = __('The theme contains no files.');
$this->strings['process_failed'] = __('Theme install failed.');
$this->strings['process_failed'] = __('Theme installation failed.');
$this->strings['process_success'] = __('Theme installed successfully.');
/* translators: 1: theme name, 2: version */
$this->strings['process_success_specific'] = __('Successfully installed the theme <strong>%1$s %2$s</strong>.');
@ -110,7 +110,7 @@ class Theme_Upgrader extends WP_Upgrader {
if ( ! $api || is_wp_error($api) ) {
$this->skin->feedback( 'parent_theme_not_found', $theme_info->get('Template') );
// Don't show activate or preview actions after install
// Don't show activate or preview actions after installation
add_filter('install_theme_complete_actions', array($this, 'hide_activate_preview_actions') );
return $install_result;
}
@ -180,7 +180,7 @@ class Theme_Upgrader extends WP_Upgrader {
* Default true.
* }
*
* @return bool|WP_Error True if the install was successful, false or a WP_Error object otherwise.
* @return bool|WP_Error True if the installation was successful, false or a WP_Error object otherwise.
*/
public function install( $package, $args = array() ) {

2
wp-admin/includes/class-wp-automatic-updater.php
View File

@ -443,7 +443,7 @@ class WP_Automatic_Updater {
wp_update_plugins(); // Check for Plugin updates
}
// Send debugging email to all development installs.
// Send debugging email to admin for all development installations.
if ( ! empty( $this->update_results ) ) {
$development_version = false !== strpos( get_bloginfo( 'version' ), '-' );

2
wp-admin/includes/class-wp-ms-sites-list-table.php
View File

@ -551,7 +551,7 @@ class WP_MS_Sites_List_Table extends WP_List_Table {
* @param array $actions An array of action links to be displayed.
* @param int $blog_id The site ID.
* @param string $blogname Site path, formatted depending on whether it is a sub-domain
* or subdirectory multisite install.
* or subdirectory multisite installation.
*/
$actions = apply_filters( 'manage_sites_action_links', array_filter( $actions ), $blog['blog_id'], $blogname );
return $this->row_actions( $actions );

6
wp-admin/includes/class-wp-plugin-install-list-table.php
View File

@ -559,13 +559,13 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
<div class="column-downloaded">
<?php
if ( $plugin['active_installs'] >= 1000000 ) {
$active_installs_text = _x( '1+ Million', 'Active plugin installs' );
$active_installs_text = _x( '1+ Million', 'Active plugin installations' );
} elseif ( 0 == $plugin['active_installs'] ) {
$active_installs_text = _x( 'Less Than 10', 'Active plugin installs' );
$active_installs_text = _x( 'Less Than 10', 'Active plugin installations' );
} else {
$active_installs_text = number_format_i18n( $plugin['active_installs'] ) . '+';
}
printf( __( '%s Active Installs' ), $active_installs_text );
printf( __( '%s Active Installations' ), $active_installs_text );
?>
</div>
<div class="column-compatibility">

12
wp-admin/includes/class-wp-upgrader.php
View File

@ -79,7 +79,7 @@ class WP_Upgrader {
* @var WP_Error|array $result {
* @type string $source The full path to the source the files were installed from.
* @type string $source_files List of all the files in the source directory.
* @type string $destination The full path to the install destination folder.
* @type string $destination The full path to the installation destination folder.
* @type string $destination_name The name of the destination folder, or empty if `$destination`
* and `$local_destination` are the same.
* @type string $local_destination The full local path to the destination folder. This is usually
@ -570,11 +570,11 @@ class WP_Upgrader {
$this->result = compact( 'source', 'source_files', 'destination', 'destination_name', 'local_destination', 'remote_destination', 'clear_destination' );
/**
* Filters the install response after the installation has finished.
* Filters the installation response after the installation has finished.
*
* @since 2.8.0
*
* @param bool $response Install response.
* @param bool $response Installation response.
* @param array $hook_extra Extra arguments passed to hooked filters.
* @param array $result Installation result data.
*/
@ -590,7 +590,7 @@ class WP_Upgrader {
}
/**
* Run an upgrade/install.
* Run an upgrade/installation.
*
* Attempts to download the package (if it is not a local file), unpack it, and
* install it in the destination folder.
@ -612,7 +612,7 @@ class WP_Upgrader {
* @type bool $abort_if_destination_exists Whether to abort the installation if the destination
* folder already exists. When true, `$clear_destination`
* should be false. Default true.
* @type bool $is_multi Whether this run is one of multiple upgrade/install
* @type bool $is_multi Whether this run is one of multiple upgrade/installation
* actions being performed in bulk. When true, the skin
* WP_Upgrader::header() and WP_Upgrader::footer()
* aren't called. Default false.
@ -735,7 +735,7 @@ class WP_Upgrader {
$this->skin->error($result);
$this->skin->feedback('process_failed');
} else {
// Install succeeded.
// Installation succeeded.
$this->skin->feedback('process_success');
}

2
wp-admin/includes/ms.php
View File

@ -628,7 +628,7 @@ function site_admin_notice() {
/**
* Avoids a collision between a site slug and a permalink slug.
*
* In a subdirectory install this will make sure that a site and a post do not use the
* In a subdirectory installation this will make sure that a site and a post do not use the
* same subdirectory by checking for a site with the same name as a new post.
*
* @since 3.0.0

28
wp-admin/includes/network.php
View File

@ -27,10 +27,10 @@ function network_domain_check() {
}
/**
* 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() {
$domain = preg_replace( '|https?://([^/]+)|', '$1', get_option( 'home' ) );
@ -41,22 +41,22 @@ function allow_subdomain_install() {
}
/**
* Allow subdirectory install.
* Allow subdirectory installation.
*
* @since 3.0.0
*
* @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 ) )
return true;
@ -257,7 +257,7 @@ function network_step1( $errors = false ) {
<table class="form-table">
<?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(
/* translators: 1: localhost 2: localhost.localdomain */
@ -267,24 +267,24 @@ function network_step1( $errors = false ) {
);
// 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>
<?php endif; ?>

24
wp-admin/includes/plugin-install.php
View File

@ -19,7 +19,7 @@
* an object is returned.
*
* The second filter, {@see 'plugins_api'}, allows a plugin to override the WordPress.org
* Plugin Install API entirely. If `$action` is 'query_plugins' or 'plugin_information',
* Plugin Installation API entirely. If `$action` is 'query_plugins' or 'plugin_information',
* an object MUST be passed. If `$action` is 'hot_tags' or 'hot_categories', an array MUST
* be passed.
*
@ -89,7 +89,7 @@
* @type bool $reviews Whether to return the plugin reviews. Default false.
* @type bool $banners Whether to return the banner images links. Default false.
* @type bool $icons Whether to return the icon links. Default false.
* @type bool $active_installs Whether to return the number of active installs. Default false.
* @type bool $active_installs Whether to return the number of active installations. Default false.
* @type bool $group Whether to return the assigned group. Default false.
* @type bool $contributors Whether to return the list of contributors. Default false.
* }
@ -113,19 +113,19 @@ function plugins_api( $action, $args = array() ) {
}
/**
* Filters the WordPress.org Plugin Install API arguments.
* Filters the WordPress.org Plugin Installation API arguments.
*
* Important: An object MUST be returned to this filter.
*
* @since 2.7.0
*
* @param object $args Plugin API arguments.
* @param string $action The type of information being requested from the Plugin Install API.
* @param string $action The type of information being requested from the Plugin Installation API.
*/
$args = apply_filters( 'plugins_api_args', $args, $action );
/**
* Filters the response for the current WordPress.org Plugin Install API request.
* Filters the response for the current WordPress.org Plugin Installation API request.
*
* Passing a non-false value will effectively short-circuit the WordPress.org API request.
*
@ -135,7 +135,7 @@ function plugins_api( $action, $args = array() ) {
* @since 2.7.0
*
* @param false|object|array $result The result object or array. Default false.
* @param string $action The type of information being requested from the Plugin Install API.
* @param string $action The type of information being requested from the Plugin Installation API.
* @param object $args Plugin API arguments.
*/
$res = apply_filters( 'plugins_api', false, $action, $args );
@ -193,12 +193,12 @@ function plugins_api( $action, $args = array() ) {
}
/**
* Filters the Plugin Install API response results.
* Filters the Plugin Installation API response results.
*
* @since 2.7.0
*
* @param object|WP_Error $res Response object or WP_Error.
* @param string $action The type of information being requested from the Plugin Install API.
* @param string $action The type of information being requested from the Plugin Installation API.
* @param object $args Plugin API arguments.
*/
return apply_filters( 'plugins_api_result', $res, $action, $args );
@ -515,7 +515,7 @@ function install_plugin_information() {
$section = reset( $section_titles );
}
iframe_header( __( 'Plugin Install' ) );
iframe_header( __( 'Plugin Installation' ) );
$_with_banner = '';
@ -587,11 +587,11 @@ function install_plugin_information() {
<?php } if ( ! empty( $api->tested ) ) { ?>
<li><strong><?php _e( 'Compatible up to:' ); ?></strong> <?php echo $api->tested; ?></li>
<?php } if ( isset( $api->active_installs ) ) { ?>
<li><strong><?php _e( 'Active Installs:' ); ?></strong> <?php
<li><strong><?php _e( 'Active Installations:' ); ?></strong> <?php
if ( $api->active_installs >= 1000000 ) {
_ex( '1+ Million', 'Active plugin installs' );
_ex( '1+ Million', 'Active plugin installations' );
} elseif ( 0 == $api->active_installs ) {
_ex( 'Less Than 10', 'Active plugin installs' );
_ex( 'Less Than 10', 'Active plugin installations' );
} else {
echo number_format_i18n( $api->active_installs ) . '+';
}

2
wp-admin/includes/plugin.php
View File

@ -419,7 +419,7 @@ function _get_dropins() {
'advanced-cache.php' => array( __( 'Advanced caching plugin.' ), 'WP_CACHE' ), // WP_CACHE
'db.php' => array( __( 'Custom database class.' ), true ), // auto on load
'db-error.php' => array( __( 'Custom database error message.' ), true ), // auto on error
'install.php' => array( __( 'Custom install script.' ), true ), // auto on install
'install.php' => array( __( 'Custom installation script.' ), true ), // auto on installation
'maintenance.php' => array( __( 'Custom maintenance message.' ), true ), // auto on maintenance
'object-cache.php' => array( __( 'External object cache.' ), true ), // auto on load
);

6
wp-admin/includes/schema.php
View File

@ -890,9 +890,9 @@ endif;
* @param string $email Email address for the network administrator.
* @param string $site_name The name of the network.
* @param string $path Optional. The path to append to the network's domain name. Default '/'.
* @param bool $subdomain_install Optional. Whether the network is a subdomain install or a subdirectory install.
* Default false, meaning the network is a subdirectory install.
* @return bool|WP_Error True on success, or WP_Error on warning (with the install otherwise successful,
* @param bool $subdomain_install Optional. Whether the network is a subdomain installation or a subdirectory installation.
* Default false, meaning the network is a subdirectory installation.
* @return bool|WP_Error True on success, or WP_Error on warning (with the installation otherwise successful,
* so the error code must be checked) or failure.
*/
function populate_network( $network_id = 1, $domain = '', $email = '', $site_name = '', $path = '/', $subdomain_install = false ) {

4
wp-admin/includes/theme-install.php
View File

@ -1,6 +1,6 @@
<?php
/**
* WordPress Theme Install Administration API
* WordPress Theme Installation Administration API
*
* @package WordPress
* @subpackage Administration
@ -202,7 +202,7 @@ function install_theme_information() {
if ( is_wp_error( $theme ) )
wp_die( $theme );
iframe_header( __('Theme Install') );
iframe_header( __('Theme Installation') );
if ( ! isset( $wp_list_table ) ) {
$wp_list_table = _get_list_table('WP_Theme_Install_List_Table');
}

6
wp-admin/includes/translation-install.php
View File

@ -1,6 +1,6 @@
<?php
/**
* WordPress Translation Install Administration API
* WordPress Translation Installation Administration API
*
* @package WordPress
* @subpackage Administration
@ -24,7 +24,7 @@ function translations_api( $type, $args = null ) {
}
/**
* Allows a plugin to override the WordPress.org Translation Install API entirely.
* Allows a plugin to override the WordPress.org Translation Installation API entirely.
*
* @since 4.0.0
*
@ -93,7 +93,7 @@ function translations_api( $type, $args = null ) {
}
/**
* Filters the Translation Install API response results.
* Filters the Translation Installation API response results.
*
* @since 4.0.0
*

2
wp-admin/includes/update-core.php
View File

@ -1197,7 +1197,7 @@ function _copy_dir($from, $to, $skip_list = array() ) {
/**
* Redirect to the About WordPress page after a successful upgrade.
*
* This function is only needed when the existing install is older than 3.4.0.
* This function is only needed when the existing installation is older than 3.4.0.
*
* @since 3.3.0
*

4
wp-admin/includes/update.php
View File

@ -63,7 +63,7 @@ function get_core_updates( $options = array() ) {
/**
* Gets the best available (and enabled) Auto-Update for WordPress Core.
*
* 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
* 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
*
* @since 3.7.0
*
@ -596,7 +596,7 @@ function maintenance_nag() {
$failed = get_site_option( 'auto_core_update_failed' );
/*
* If an update failed critically, we may have copied over version.php but not other files.
* In that case, if the install claims we're running the version we attempted, nag.
* In that case, if the installation claims we're running the version we attempted, nag.
* This is serious enough to err on the side of nagging.
*
* If we simply failed to update before we tried to copy any files, then assume things are

10
wp-admin/includes/upgrade.php
View File

@ -8,7 +8,7 @@
* @subpackage Administration
*/
/** Include user install customize script. */
/** Include user installation customization script. */
if ( file_exists(WP_CONTENT_DIR . '/install.php') )
require (WP_CONTENT_DIR . '/install.php');
@ -95,7 +95,7 @@ function wp_install( $blog_title, $user_name, $user_email, $public, $deprecated
flush_rewrite_rules();
wp_new_blog_notification($blog_title, $guessurl, $user_id, ($email_password ? $user_password : __('The password you chose during the install.') ) );
wp_new_blog_notification($blog_title, $guessurl, $user_id, ($email_password ? $user_password : __('The password you chose during installation.') ) );
wp_cache_flush();
@ -285,7 +285,7 @@ As a new WordPress user, you should go to <a href=\"%s\">your dashboard</a> to d
endif;
/**
* Maybe enable pretty permalinks on install.
* Maybe enable pretty permalinks on installation.
*
* If after enabling pretty permalinks don't work, fallback to query-string permalinks.
*
@ -452,7 +452,7 @@ function wp_upgrade() {
endif;
/**
* Functions to be called in install and upgrade scripts.
* Functions to be called in installation and upgrade scripts.
*
* Contains conditional checks to determine which upgrade scripts to run,
* based on database version and WP version being updated-to.
@ -2060,7 +2060,7 @@ function get_alloptions_110() {
}
/**
* Utility version of get_option that is private to install/upgrade.
* Utility version of get_option that is private to installation/upgrade.
*
* @ignore
* @since 1.5.1

2
wp-admin/install.php
View File

@ -49,7 +49,7 @@ nocache_headers();
$step = isset( $_GET['step'] ) ? (int) $_GET['step'] : 0;
/**
* Display install header.
* Display installation header.
*
* @since 2.5.0
*

2
wp-admin/network.php
View File

@ -57,7 +57,7 @@ if ( is_network_admin() ) {
}
$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>' .
'<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>' .
'<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>' .
'<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>' .
'<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>' .
'<p>' . __('Once you add this code and refresh your browser, multisite should be enabled. This screen, now in the Network Admin navigation menu, will keep an archive of the added code. You can toggle between Network Admin and Site Admin by clicking on the Network Admin or an individual site name under the My Sites dropdown in the Toolbar.') . '</p>' .

4
wp-admin/network/settings.php
View File

@ -10,7 +10,7 @@
/** Load WordPress Administration Bootstrap */
require_once( dirname( __FILE__ ) . '/admin.php' );
/** WordPress Translation Install API */
/** WordPress Translation Installation API */
require_once( ABSPATH . 'wp-admin/includes/translation-install.php' );
if ( ! current_user_can( 'manage_network_options' ) )
@ -62,7 +62,7 @@ if ( $_POST ) {
'first_comment_email',
);
// Handle translation install.
// Handle translation installation.
if ( ! empty( $_POST['WPLANG'] ) && current_user_can( 'install_languages' ) ) {
$language = wp_download_language_pack( $_POST['WPLANG'] );
if ( $language ) {

6
wp-admin/network/site-new.php
View File

@ -10,7 +10,7 @@
/** Load WordPress Administration Bootstrap */
require_once( dirname( __FILE__ ) . '/admin.php' );
/** WordPress Translation Install API */
/** WordPress Translation Installation API */
require_once( ABSPATH . 'wp-admin/includes/translation-install.php' );
if ( ! current_user_can( 'create_sites' ) ) {
@ -42,7 +42,7 @@ if ( isset($_REQUEST['action']) && 'add-site' == $_REQUEST['action'] ) {
if ( preg_match( '|^([a-zA-Z0-9-])+$|', $blog['domain'] ) )
$domain = strtolower( $blog['domain'] );
// If not a subdomain install, make sure the domain isn't a reserved word
// If not a subdomain installation, make sure the domain isn't a reserved word
if ( ! is_subdomain_install() ) {
$subdirectory_reserved_names = get_subdirectory_reserved_names();
@ -62,7 +62,7 @@ if ( isset($_REQUEST['action']) && 'add-site' == $_REQUEST['action'] ) {
'public' => 1
);
// Handle translation install for the new site.
// Handle translation installation for the new site.
if ( isset( $_POST['WPLANG'] ) ) {
if ( '' === $_POST['WPLANG'] ) {
$meta['WPLANG'] = ''; // en_US

2
wp-admin/options-general.php
View File

@ -9,7 +9,7 @@
/** WordPress Administration Bootstrap */
require_once( dirname( __FILE__ ) . '/admin.php' );
/** WordPress Translation Install API */
/** WordPress Translation Installation API */
require_once( ABSPATH . 'wp-admin/includes/translation-install.php' );
if ( ! current_user_can( 'manage_options' ) )

2
wp-admin/options-writing.php
View File

@ -27,7 +27,7 @@ if ( apply_filters( 'enable_post_by_email_configuration', true ) ) {
get_current_screen()->add_help_tab( array(
'id' => 'options-postemail',
'title' => __( 'Post Via Email' ),
'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>',
'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>',
) );
}

2
wp-admin/options.php
View File

@ -176,7 +176,7 @@ if ( 'update' == $action ) {
$_POST['timezone_string'] = '';
}
// Handle translation install.
// Handle translation installation.
if ( ! empty( $_POST['WPLANG'] ) && current_user_can( 'install_languages' ) ) {
require_once( ABSPATH . 'wp-admin/includes/translation-install.php' );

4
wp-admin/plugin-install.php
View File

@ -67,7 +67,7 @@ wp_enqueue_script( 'updates' );
do_action( "install_plugins_pre_{$tab}" );
/*
* Call the pre upload action on every non-upload plugin install screen
* Call the pre upload action on every non-upload plugin installation screen
* because the form is always displayed on these screens.
*/
if ( 'upload' !== $tab ) {
@ -129,7 +129,7 @@ if ( ! empty( $tabs['upload'] ) && current_user_can( 'upload_plugins' ) ) {
<?php
/*
* Output the upload plugin form on every non-upload plugin install screen, so it can be
* Output the upload plugin form on every non-upload plugin installation screen, so it can be
* displayed via JavaScript rather then opening up the devoted upload plugin page.
*/
if ( 'upload' !== $tab ) {

10
wp-admin/setup-config.php
View File

@ -35,7 +35,7 @@ require( ABSPATH . 'wp-settings.php' );
/** Load WordPress Administration Upgrade API */
require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
/** Load WordPress Translation Install API */
/** Load WordPress Translation Installation API */
require_once( ABSPATH . 'wp-admin/includes/translation-install.php' );
nocache_headers();
@ -57,7 +57,7 @@ if ( file_exists( ABSPATH . 'wp-config.php' ) )
) . '</p>'
);
// Check if wp-config.php exists above the root directory but is not part of another install
// Check if wp-config.php exists above the root directory but is not part of another installation
if ( @file_exists( ABSPATH . '../wp-config.php' ) && ! @file_exists( ABSPATH . '../wp-settings.php' ) ) {
wp_die( '<p>' . sprintf(
/* translators: %s: install.php */
@ -368,8 +368,8 @@ switch($step) {
echo htmlentities($line, ENT_COMPAT, 'UTF-8');
}
?></textarea>
<p><?php _e( 'After you&#8217;ve done that, click &#8220;Run the install.&#8221;' ); ?></p>
<p class="step"><a href="<?php echo $install; ?>" class="button button-large"><?php _e( 'Run the install' ); ?></a></p>
<p><?php _e( 'After you&#8217;ve done that, click &#8220;Run the installation.&#8221;' ); ?></p>
<p class="step"><a href="<?php echo $install; ?>" class="button button-large"><?php _e( 'Run the installation' ); ?></a></p>
<script>
(function(){
if ( ! /iPad|iPod|iPhone/.test( navigator.userAgent ) ) {
@ -401,7 +401,7 @@ if ( ! /iPad|iPod|iPhone/.test( navigator.userAgent ) ) {
<h1 class="screen-reader-text"><?php _e( 'Successful database connection' ) ?></h1>
<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>
<p class="step"><a href="<?php echo $install; ?>" class="button button-large"><?php _e( 'Run the install' ); ?></a></p>
<p class="step"><a href="<?php echo $install; ?>" class="button button-large"><?php _e( 'Run the installation' ); ?></a></p>
<?php
endif;
break;

4
wp-admin/theme-install.php
View File

@ -76,7 +76,7 @@ if ( $tab ) {
* Fires before each of the tabs are rendered on the Install Themes page.
*
* The dynamic portion of the hook name, `$tab`, refers to the current
* theme install tab. Possible values are 'dashboard', 'search', 'upload',
* theme installation tab. Possible values are 'dashboard', 'search', 'upload',
* 'featured', 'new', or 'updated'.
*
* @since 2.8.0
@ -236,7 +236,7 @@ if ( $tab ) {
* Fires at the top of each of the tabs on the Install Themes page.
*
* The dynamic portion of the hook name, `$tab`, refers to the current
* theme install tab. Possible values are 'dashboard', 'search', 'upload',
* theme installation tab. Possible values are 'dashboard', 'search', 'upload',
* 'featured', 'new', or 'updated'.
*
* @since 2.8.0

2
wp-admin/update.php
View File

@ -120,7 +120,7 @@ if ( isset($_GET['action']) ) {
wp_die( $api );
}
$title = __('Plugin Install');
$title = __('Plugin Installation');
$parent_file = 'plugins.php';
$submenu_file = 'plugin-install.php';
require_once(ABSPATH . 'wp-admin/admin-header.php');

4
wp-includes/class-wp-customize-manager.php
View File

@ -535,7 +535,7 @@ final class WP_Customize_Manager {
}
/*
* Import theme starter content for fresh installs when landing in the customizer.
* Import theme starter content for fresh installations when landing in the customizer.
* Import starter content at after_setup_theme:100 so that any
* add_theme_support( 'starter-content' ) calls will have been made.
*/
@ -1760,7 +1760,7 @@ final class WP_Customize_Manager {
$setting_validities = $this->validate_setting_values( $post_values );
$exported_setting_validities = array_map( array( $this, 'prepare_setting_validity_for_js' ), $setting_validities );
// Note that the REQUEST_URI is not passed into home_url() since this breaks subdirectory installs.
// Note that the REQUEST_URI is not passed into home_url() since this breaks subdirectory installations.
$self_url = empty( $_SERVER['REQUEST_URI'] ) ? home_url( '/' ) : esc_url_raw( wp_unslash( $_SERVER['REQUEST_URI'] ) );
$state_query_params = array(
'customize_theme',

4
wp-includes/class-wp-locale-switcher.php
View File

@ -158,11 +158,11 @@ class WP_Locale_Switcher {
}
/**
* Filters the WordPress install's locale.
* Filters the locale of the WordPress installation.
*
* @since 4.7.0
*
* @param string $locale The WordPress install's locale.
* @param string $locale The locale of the WordPress installation.
* @return string The locale currently being switched to.
*/
public function filter_locale( $locale ) {

2
wp-includes/class-wp-network.php
View File

@ -273,7 +273,7 @@ class WP_Network {
* only domains, thus meaning paths never need to be considered.
*
* This is a very basic optimization; anything further could have
* drawbacks depending on the setup, so this is best done per-install.
* drawbacks depending on the setup, so this is best done per-installation.
*/
$using_paths = true;
if ( wp_using_ext_object_cache() ) {

2
wp-includes/default-constants.php
View File

@ -349,7 +349,7 @@ function wp_templating_constants() {
define('STYLESHEETPATH', get_stylesheet_directory());
/**
* Slug of the default theme for this install.
* Slug of the default theme for this installation.
* Used as the default theme when installing new sites.
* It will be used as the fallback if the current theme doesn't exist.
*

2
wp-includes/deprecated.php
View File

@ -3372,7 +3372,7 @@ function _search_terms_tidy( $t ) {
* Determine if TinyMCE is available.
*
* Checks to see if the user has deleted the tinymce files to slim down
* their WordPress install.
* their WordPress installation.
*
* @since 2.1.0
* @deprecated 3.9.0

8
wp-includes/functions.php
View File

@ -1388,13 +1388,13 @@ function is_blog_installed() {
$suppress = $wpdb->suppress_errors();
/*
* Loop over the WP tables. If none exist, then scratch install is allowed.
* Loop over the WP tables. If none exist, then scratch installation is allowed.
* If one or more exist, suggest table repair since we got here because the
* options table could not be accessed.
*/
$wp_tables = $wpdb->tables();
foreach ( $wp_tables as $table ) {
// The existence of custom user tables shouldn't suggest an insane state or prevent a clean install.
// The existence of custom user tables shouldn't suggest an insane state or prevent a clean installation.
if ( defined( 'CUSTOM_USER_TABLE' ) && CUSTOM_USER_TABLE == $table )
continue;
if ( defined( 'CUSTOM_USER_META_TABLE' ) && CUSTOM_USER_META_TABLE == $table )
@ -4326,7 +4326,7 @@ function wp_guess_url() {
} elseif ( false !== strpos( $abspath_fix, $script_filename_dir ) ) {
// Request is hitting a file above ABSPATH
$subdirectory = substr( $abspath_fix, strpos( $abspath_fix, $script_filename_dir ) + strlen( $script_filename_dir ) );
// Strip off any file/query params from the path, appending the sub directory to the install
// Strip off any file/query params from the path, appending the sub directory to the installation
$path = preg_replace( '#/[^/]*$#i', '' , $_SERVER['REQUEST_URI'] ) . $subdirectory;
} else {
$path = $_SERVER['REQUEST_URI'];
@ -4408,7 +4408,7 @@ function is_main_site( $site_id = null ) {
}
/**
* Determine whether a network is the main network of the Multisite install.
* Determine whether a network is the main network of the Multisite installation.
*
* @since 3.7.0
*

6
wp-includes/l10n.php
View File

@ -32,7 +32,7 @@ function get_locale() {
if ( isset( $locale ) ) {
/**
* Filters WordPress install's locale ID.
* Filters the locale ID of the WordPress installation.
*
* @since 1.5.0
*
@ -979,9 +979,9 @@ function is_textdomain_loaded( $domain ) {
* are dummy gettext calls to get them into the POT file and this function
* properly translates them back.
*
* The before_last_bar() call is needed, because older installs keep the roles
* The before_last_bar() call is needed, because older installations keep the roles
* using the old context format: 'Role name|User role' and just skipping the
* content after the last bar is easier than fixing them in the DB. New installs
* content after the last bar is easier than fixing them in the DB. New installations
* won't suffer from that problem.
*
* @since 2.8.0

2
wp-includes/ms-deprecated.php
View File

@ -460,7 +460,7 @@ function get_admin_users_for_domain( $domain = '', $path = '' ) {
* @type int $limit Number of sites to limit the query to. Default 100.
* @type int $offset Exclude the first x sites. Used in combination with the $limit parameter. Default 0.
* }
* @return array An empty array if the install is considered "large" via wp_is_large_network(). Otherwise,
* @return array An empty array if the installation is considered "large" via wp_is_large_network(). Otherwise,
* an associative array of site data arrays, each containing the site (network) ID, blog ID,
* site domain and path, dates registered and modified, and the language ID. Also, boolean
* values for whether the site is public, archived, mature, spam, and/or deleted.

22
wp-includes/ms-functions.php
View File

@ -586,7 +586,7 @@ function wpmu_validate_blog_signup( $blogname, $blog_title, $user = '' ) {
}
/*
* On sub dir installs, some names are so illegal, only a filter can
* On sub dir installations, some names are so illegal, only a filter can
* spring them from jail.
*/
if ( ! is_subdomain_install() ) {
@ -680,7 +680,7 @@ function wpmu_validate_blog_signup( $blogname, $blog_title, $user = '' ) {
* Array of domain, path, blog name, blog title, user and error messages.
*
* @type string $domain Domain for the site.
* @type string $path Path for the site. Used in subdirectory installs.
* @type string $path Path for the site. Used in subdirectory installations.
* @type string $blogname The unique site name (slug).
* @type string $blog_title Blog title.
* @type string|WP_User $user By default, an empty string. A user object if provided.
@ -1164,9 +1164,9 @@ function wpmu_create_user( $user_name, $password, $email ) {
* as when a Super Admin creates a new site. Hook to {@see 'wpmu_new_blog'}
* for events that should affect all new sites.
*
* On subdirectory installs, $domain is the same as the main site's
* On subdirectory installations, $domain is the same as the main site's
* domain, and the path is the subdirectory name (eg 'example.com'
* and '/blog1/'). On subdomain installs, $domain is the new subdomain +
* and '/blog1/'). On subdomain installations, $domain is the new subdomain +
* root domain (eg 'blog1.example.com'), and $path is '/'.
*
* @since MU (3.0.0)
@ -1180,7 +1180,7 @@ function wpmu_create_user( $user_name, $password, $email ) {
* 'spam', 'deleted', or 'lang_id') the given site status(es) will be
* updated. Otherwise, keys and values will be used to set options for
* the new site. Default empty array.
* @param int $network_id Optional. Network ID. Only relevant on multi-network installs.
* @param int $network_id Optional. Network ID. Only relevant on multi-network installations.
* @return int|WP_Error Returns WP_Error object on failure, the new site ID on success.
*/
function wpmu_create_blog( $domain, $path, $title, $user_id, $meta = array(), $network_id = 1 ) {
@ -1240,7 +1240,7 @@ function wpmu_create_blog( $domain, $path, $title, $user_id, $meta = array(), $n
* @param int $user_id User ID.
* @param string $domain Site domain.
* @param string $path Site path.
* @param int $network_id Network ID. Only relevant on multi-network installs.
* @param int $network_id Network ID. Only relevant on multi-network installations.
* @param array $meta Meta data. Used to set initial site options.
*/
do_action( 'wpmu_new_blog', $blog_id, $user_id, $domain, $path, $network_id, $meta );
@ -1352,7 +1352,7 @@ Disable these notifications: %3$s'), $user->user_login, wp_unslash( $_SERVER['RE
*
* @param string $domain The domain to be checked.
* @param string $path The path to be checked.
* @param int $network_id Optional. Network ID. Relevant only on multi-network installs.
* @param int $network_id Optional. Network ID. Relevant only on multi-network installations.
* @return int
*/
function domain_exists( $domain, $path, $network_id = 1 ) {
@ -1374,7 +1374,7 @@ function domain_exists( $domain, $path, $network_id = 1 ) {
* @param int|null $result The blog_id if the blogname exists, null otherwise.
* @param string $domain Domain to be checked.
* @param string $path Path to be checked.
* @param int $network_id Network ID. Relevant only on multi-network installs.
* @param int $network_id Network ID. Relevant only on multi-network installations.
*/
return apply_filters( 'domain_exists', $result, $domain, $path, $network_id );
}
@ -1391,7 +1391,7 @@ function domain_exists( $domain, $path, $network_id = 1 ) {
*
* @param string $domain The domain of the new site.
* @param string $path The path of the new site.
* @param int $network_id Unless you're running a multi-network install, be sure to set this value to 1.
* @param int $network_id Unless you're running a multi-network installation, be sure to set this value to 1.
* @return int|false The ID of the new row
*/
function insert_blog($domain, $path, $network_id) {
@ -2570,7 +2570,7 @@ function wp_is_large_network( $using = 'sites', $network_id = null ) {
}
/**
* Retrieves a list of reserved site on a sub-directory Multisite install.
* Retrieves a list of reserved site on a sub-directory Multisite installation.
*
* @since 4.4.0
*
@ -2583,7 +2583,7 @@ function get_subdirectory_reserved_names() {
);
/**
* Filters reserved site names on a sub-directory Multisite install.
* Filters reserved site names on a sub-directory Multisite installation.
*
* @since 3.0.0
* @since 4.4.0 'wp-admin', 'wp-content', 'wp-includes', 'wp-json', and 'embed' were added

8
wp-includes/ms-load.php
View File

@ -308,8 +308,8 @@ function ms_load_current_site_and_network( $domain, $path, $subdomain = false )
} elseif ( ! $subdomain ) {
/*
* A "subdomain" install can be re-interpreted to mean "can support any domain".
* If we're not dealing with one of these installs, then the important part is determining
* A "subdomain" installation can be re-interpreted to mean "can support any domain".
* If we're not dealing with one of these installations, then the important part is determining
* the network first, because we need the network's path to identify any sites.
*/
if ( ! $current_site = wp_cache_get( 'current_network', 'site-options' ) ) {
@ -401,10 +401,10 @@ function ms_load_current_site_and_network( $domain, $path, $subdomain = false )
do_action( 'ms_site_not_found', $current_site, $domain, $path );
if ( $subdomain && ! defined( 'NOBLOGREDIRECT' ) ) {
// For a "subdomain" install, redirect to the signup form specifically.
// For a "subdomain" installation, redirect to the signup form specifically.
$destination .= 'wp-signup.php?new=' . str_replace( '.' . $current_site->domain, '', $domain );
} elseif ( $subdomain ) {
// For a "subdomain" install, the NOBLOGREDIRECT constant
// For a "subdomain" installation, the NOBLOGREDIRECT constant
// can be used to avoid a redirect to the signup form.
// Using the ms_site_not_found action is preferred to the constant.
if ( '%siteurl%' !== NOBLOGREDIRECT ) {

6
wp-includes/plugin.php
View File

@ -780,12 +780,12 @@ function register_deactivation_hook($file, $function) {
* The plugin should not run arbitrary code outside of functions, when
* registering the uninstall hook. In order to run using the hook, the plugin
* will have to be included, which means that any code laying outside of a
* function will be run during the uninstall process. The plugin should not
* hinder the uninstall process.
* function will be run during the uninstallation process. The plugin should not
* hinder the uninstallation process.
*
* If the plugin can not be written without running code within the plugin, then
* the plugin should create a file named 'uninstall.php' in the base plugin
* folder. This file will be called, if it exists, during the uninstall process
* folder. This file will be called, if it exists, during the uninstallation process
* bypassing the uninstall hook. The plugin, when using the 'uninstall.php'
* should always check for the 'WP_UNINSTALL_PLUGIN' constant, before
* executing.

2
wp-includes/script-loader.php
View File

@ -743,7 +743,7 @@ function wp_default_scripts( &$scripts ) {
'installing' => __( 'Installing...' ),
'pluginInstalled' => _x( 'Installed!', 'plugin' ),
'themeInstalled' => _x( 'Installed!', 'theme' ),
'installFailedShort' => __( 'Install Failed!' ),
'installFailedShort' => __( 'Installation Failed!' ),
/* translators: %s: Error string for a failed installation */
'installFailed' => __( 'Installation failed: %s' ),
/* translators: %s: Plugin name and version */

2
wp-includes/user.php
View File

@ -1383,7 +1383,7 @@ function validate_username( $username ) {
*
* @since 2.0.0
* @since 3.6.0 The `aim`, `jabber`, and `yim` fields were removed as default user contact
* methods for new installs. See wp_get_user_contact_methods().
* methods for new installations. See wp_get_user_contact_methods().
* @since 4.7.0 The user's locale can be passed to `$userdata`.
*
* @global wpdb $wpdb WordPress database abstraction object.

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.9-alpha-41288';
$wp_version = '4.9-alpha-41289';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.

2
wp-load.php
View File

@ -38,7 +38,7 @@ if ( file_exists( ABSPATH . 'wp-config.php') ) {
} elseif ( @file_exists( dirname( ABSPATH ) . '/wp-config.php' ) && ! @file_exists( dirname( ABSPATH ) . '/wp-settings.php' ) ) {
/** The config file resides one level above ABSPATH but is not part of another install */
/** The config file resides one level above ABSPATH but is not part of another installation */
require_once( dirname( ABSPATH ) . '/wp-config.php' );
} else {

2
wp-settings.php
View File

@ -22,7 +22,7 @@ require_once( ABSPATH . WPINC . '/plugin.php' );
/*
* These can't be directly globalized in version.php. When updating,
* we're including version.php from another install and don't want
* we're including version.php from another installation and don't want
* these values to be overridden if already set.
*/
global $wp_version, $wp_db_version, $tinymce_version, $required_php_version, $required_mysql_version, $wp_local_package;