From 106beec6a79736d80fd30a24f6ef8a5be29d5d55 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Wed, 18 Oct 2017 19:50:47 +0000 Subject: [PATCH] I18N: Combine two "Warning" strings in `network_step1()` and `network_step2()`. Props ramiy. Fixes #38570. Built from https://develop.svn.wordpress.org/trunk@41921 git-svn-id: http://core.svn.wordpress.org/trunk@41755 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/network.php | 20 ++++++++++---------- wp-includes/version.php | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/wp-admin/includes/network.php b/wp-admin/includes/network.php index 1411d6fcf0..71cc2259dd 100644 --- a/wp-admin/includes/network.php +++ b/wp-admin/includes/network.php @@ -102,7 +102,7 @@ function network_step1( $errors = false ) { global $is_apache; if ( defined('DO_NOT_UPGRADE_GLOBAL_TABLES') ) { - echo '

' . __('ERROR:') . ' ' . __( 'The constant DO_NOT_UPGRADE_GLOBAL_TABLES cannot be defined when creating a network.' ) . '

'; + echo '

' . __( 'ERROR:' ) . ' ' . __( 'The constant DO_NOT_UPGRADE_GLOBAL_TABLES cannot be defined when creating a network.' ) . '

'; echo ''; include( ABSPATH . 'wp-admin/admin-footer.php' ); die(); @@ -110,7 +110,7 @@ function network_step1( $errors = false ) { $active_plugins = get_option( 'active_plugins' ); if ( ! empty( $active_plugins ) ) { - echo '

' . __('Warning:') . ' ' . sprintf( __( 'Please deactivate your plugins before enabling the Network feature.' ), admin_url( 'plugins.php?plugin_status=active' ) ) . '

' . __( 'Once the network is created, you may reactivate your plugins.' ) . '

'; + echo '

' . __( 'Warning:' ) . ' ' . sprintf( __( 'Please deactivate your plugins before enabling the Network feature.' ), admin_url( 'plugins.php?plugin_status=active' ) ) . '

' . __( 'Once the network is created, you may reactivate your plugins.' ) . '

'; echo ''; include( ABSPATH . 'wp-admin/admin-footer.php' ); die(); @@ -119,7 +119,7 @@ function network_step1( $errors = false ) { $hostname = get_clean_basedomain(); $has_ports = strstr( $hostname, ':' ); if ( ( false !== $has_ports && ! in_array( $has_ports, array( ':80', ':443' ) ) ) ) { - echo '

' . __( 'ERROR:') . ' ' . __( 'You cannot install a network of sites with your server address.' ) . '

'; + echo '

' . __( 'ERROR:' ) . ' ' . __( 'You cannot install a network of sites with your server address.' ) . '

'; echo '

' . sprintf( /* translators: %s: port number */ __( 'You cannot use port numbers such as %s.' ), @@ -177,7 +177,7 @@ function network_step1( $errors = false ) { ); echo '

'; } elseif ( $is_apache ) { - echo '

' . __( 'Warning!' ) . ' '; + echo '

' . __( 'Warning:' ) . ' '; /* translators: %s: mod_rewrite */ printf( __( 'It looks like the Apache %s module is not installed.' ), 'mod_rewrite' @@ -226,7 +226,7 @@ function network_step1( $errors = false ) { endif; if ( WP_CONTENT_DIR != ABSPATH . 'wp-content' && ( allow_subdirectory_install() || ! allow_subdomain_install() ) ) - echo '

' . __('Warning!') . ' ' . __( 'Subdirectory networks may not be fully compatible with custom wp-content directories.' ) . '

'; + echo '

' . __( 'Warning:' ) . ' ' . __( 'Subdirectory networks may not be fully compatible with custom wp-content directories.' ) . '

'; $is_www = ( 0 === strpos( $hostname, 'www.' ) ); if ( $is_www ) : @@ -267,7 +267,7 @@ function network_step1( $errors = false ) { ); // Uh oh: if ( !allow_subdirectory_install() ) - echo ' ' . __( 'Warning!' ) . ' ' . __( 'The main site in a sub-directory installation will need to use a modified permalink structure, potentially breaking existing links.' ) . ''; + echo ' ' . __( 'Warning:' ) . ' ' . __( 'The main site in a sub-directory installation will need to use a modified permalink structure, potentially breaking existing links.' ) . ''; ?> @@ -277,7 +277,7 @@ function network_step1( $errors = false ) { _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 ' ' . __( 'Warning!' ) . ' ' . __( 'The main site in a sub-directory installation will need to use a modified permalink structure, potentially breaking existing links.' ) . ''; + echo ' ' . __( 'Warning:' ) . ' ' . __( 'The main site in a sub-directory installation will need to use a modified permalink structure, potentially breaking existing links.' ) . ''; ?> @@ -370,7 +370,7 @@ function network_step2( $errors = false ) { } else { $subdomain_install = (bool) $wpdb->get_var( "SELECT meta_value FROM $wpdb->sitemeta WHERE site_id = 1 AND meta_key = 'subdomain_install'" ); ?> -

+

'; if ( ! $subdomain_install && WP_CONTENT_DIR != ABSPATH . 'wp-content' ) - echo '

' . __('Warning:') . ' ' . __( 'Subdirectory networks may not be fully compatible with custom wp-content directories.' ) . '

'; + echo '

' . __( 'Warning:' ) . ' ' . __( 'Subdirectory networks may not be fully compatible with custom wp-content directories.' ) . '

'; ?> @@ -582,7 +582,7 @@ EOF; ); echo '

'; if ( ! $subdomain_install && WP_CONTENT_DIR != ABSPATH . 'wp-content' ) - echo '

' . __('Warning:') . ' ' . __( 'Subdirectory networks may not be fully compatible with custom wp-content directories.' ) . '

'; + echo '

' . __( 'Warning:' ) . ' ' . __( 'Subdirectory networks may not be fully compatible with custom wp-content directories.' ) . '

'; ?> diff --git a/wp-includes/version.php b/wp-includes/version.php index d867d84151..89e3f183e2 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.9-beta2-41920'; +$wp_version = '4.9-beta2-41921'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.