Changeset 41921 for trunk/src/wp-admin/includes/network.php

Timestamp:

10/18/2017 07:49:17 PM (9 years ago)

Author:

SergeyBiryukov

Message:

I18N: Combine two "Warning" strings in network_step1() and network_step2().

Props ramiy.
Fixes #38570.

File:

• trunk/src/wp-admin/includes/network.php (modified) (10 diffs)

trunk/src/wp-admin/includes/network.php

@@ -103 +103 @@
 
         if ( defined('DO_NOT_UPGRADE_GLOBAL_TABLES') ) {
-                echo '<div class="error"><p><strong>' . __('ERROR:') . '</strong> ' . __( 'The constant DO_NOT_UPGRADE_GLOBAL_TABLES cannot be defined when creating a network.' ) . '</p></div>';
+                echo '<div class="error"><p><strong>' . __( 'ERROR:' ) . '</strong> ' . __( 'The constant DO_NOT_UPGRADE_GLOBAL_TABLES cannot be defined when creating a network.' ) . '</p></div>';
                 echo '</div>';
                 include( ABSPATH . 'wp-admin/admin-footer.php' );
@@ -111 +111 @@
         $active_plugins = get_option( 'active_plugins' );
         if ( ! empty( $active_plugins ) ) {
-                echo '<div class="updated"><p><strong>' . __('Warning:') . '</strong> ' . sprintf( __( 'Please <a href="%s">deactivate your plugins</a> before enabling the Network feature.' ), admin_url( 'plugins.php?plugin_status=active' ) ) . '</p></div><p>' . __( 'Once the network is created, you may reactivate your plugins.' ) . '</p>';
+                echo '<div class="updated"><p><strong>' . __( 'Warning:' ) . '</strong> ' . sprintf( __( 'Please <a href="%s">deactivate your plugins</a> before enabling the Network feature.' ), admin_url( 'plugins.php?plugin_status=active' ) ) . '</p></div><p>' . __( 'Once the network is created, you may reactivate your plugins.' ) . '</p>';
                 echo '</div>';
                 include( ABSPATH . 'wp-admin/admin-footer.php' );
@@ -120 +120 @@
         $has_ports = strstr( $hostname, ':' );
         if ( ( false !== $has_ports && ! in_array( $has_ports, array( ':80', ':443' ) ) ) ) {
-                echo '<div class="error"><p><strong>' . __( 'ERROR:') . '</strong> ' . __( 'You cannot install a network of sites with your server address.' ) . '</p></div>';
+                echo '<div class="error"><p><strong>' . __( 'ERROR:' ) . '</strong> ' . __( 'You cannot install a network of sites with your server address.' ) . '</p></div>';
                 echo '<p>' . sprintf(
                         /* translators: %s: port number */
@@ -178 +178 @@
                         echo '</p>';
                 } elseif ( $is_apache ) {
-                        echo '<div class="error inline"><p><strong>' . __( 'Warning!' ) . '</strong> ';
+                        echo '<div class="error inline"><p><strong>' . __( 'Warning:' ) . '</strong> ';
                         /* translators: %s: mod_rewrite */
                         printf( __( 'It looks like the Apache %s module is not installed.' ),
@@ -227 +227 @@
 
                 if ( WP_CONTENT_DIR != ABSPATH . 'wp-content' && ( allow_subdirectory_install() || ! allow_subdomain_install() ) )
-                        echo '<div class="error inline"><p><strong>' . __('Warning!') . '</strong> ' . __( 'Subdirectory networks may not be fully compatible with custom wp-content directories.' ) . '</p></div>';
+                        echo '<div class="error inline"><p><strong>' . __( 'Warning:' ) . '</strong> ' . __( 'Subdirectory networks may not be fully compatible with custom wp-content directories.' ) . '</p></div>';
 
                 $is_www = ( 0 === strpos( $hostname, 'www.' ) );
@@ -268 +268 @@
                                         // Uh oh:
                                         if ( !allow_subdirectory_install() )
-                                                echo ' <strong>' . __( 'Warning!' ) . ' ' . __( 'The main site in a sub-directory installation 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>
@@ -278 +278 @@
                                         // Uh oh:
                                         if ( !allow_subdirectory_install() )
-                                                echo ' <strong>' . __( 'Warning!' ) . ' ' . __( 'The main site in a sub-directory installation 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>
@@ -371 +371 @@
                         $subdomain_install = (bool) $wpdb->get_var( "SELECT meta_value FROM $wpdb->sitemeta WHERE site_id = 1 AND meta_key = 'subdomain_install'" );
 ?>
-        <div class="error"><p><strong><?php _e('Warning:'); ?></strong> <?php _e( 'An existing WordPress network was detected.' ); ?></p></div>
+        <div class="error"><p><strong><?php _e( 'Warning:' ); ?></strong> <?php _e( 'An existing WordPress network was detected.' ); ?></p></div>
         <p><?php _e( 'Please complete the configuration steps. To create a new network, you will need to empty or remove the network database tables.' ); ?></p>
 <?php
@@ -543 +543 @@
                 echo '</p>';
                 if ( ! $subdomain_install && WP_CONTENT_DIR != ABSPATH . 'wp-content' )
-                        echo '<p><strong>' . __('Warning:') . ' ' . __( 'Subdirectory networks may not be fully compatible with custom wp-content directories.' ) . '</strong></p>';
+                        echo '<p><strong>' . __( 'Warning:' ) . ' ' . __( 'Subdirectory networks may not be fully compatible with custom wp-content directories.' ) . '</strong></p>';
                 ?>
                 <textarea class="code" readonly="readonly" cols="100" rows="20"><?php echo esc_textarea( $web_config_file ); ?>
@@ -583 +583 @@
                 echo '</p>';
                 if ( ! $subdomain_install && WP_CONTENT_DIR != ABSPATH . 'wp-content' )
-                        echo '<p><strong>' . __('Warning:') . ' ' . __( 'Subdirectory networks may not be fully compatible with custom wp-content directories.' ) . '</strong></p>';
+                        echo '<p><strong>' . __( 'Warning:' ) . ' ' . __( 'Subdirectory networks may not be fully compatible with custom wp-content directories.' ) . '</strong></p>';
                 ?>
                 <textarea class="code" readonly="readonly" cols="100" rows="<?php echo substr_count( $htaccess_file, "\n" ) + 1; ?>">