vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-08-16 23:00:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
"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


git-svn-id: https://develop.svn.wordpress.org/trunk@41289 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
John Blackbourn
2017-08-22 11:51:11 +00:00
parent 0613540ea2
commit 8df2151660
53 changed files with 137 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/wp-admin/includes/network.php
+14 -14
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; ?>