WordPress.org

Make WordPress Core

Ticket #34598: 34598.patch

File 34598.patch, 3.6 KB (added by ramiy, 6 years ago)
  • wp-admin/includes/network.php

     
    160160        } else {
    161161                $subdomain_install = false;
    162162                if ( $got_mod_rewrite = got_mod_rewrite() ) // dangerous assumptions
    163                         echo '<div class="updated inline"><p><strong>' . __( 'Note:' ) . '</strong> ' . __( 'Please make sure the Apache <code>mod_rewrite</code> module is installed as it will be used at the end of this installation.' ) . '</p>';
     163                        echo '<div class="updated inline"><p><strong>' . __( 'Note:' ) . '</strong> ' . sprintf( __( 'Please make sure the Apache %s module is installed as it will be used at the end of this installation.' ), '<code>mod_rewrite</code>' ) . '</p>';
    164164                elseif ( $is_apache )
    165                         echo '<div class="error inline"><p><strong>' . __( 'Warning!' ) . '</strong> ' . __( 'It looks like the Apache <code>mod_rewrite</code> module is not installed.' ) . '</p>';
     165                        echo '<div class="error inline"><p><strong>' . __( 'Warning!' ) . '</strong> ' . sprintf( __( 'It looks like the Apache %s module is not installed.' ), '<code>mod_rewrite</code>' ) . '</p>';
    166166                if ( $got_mod_rewrite || $is_apache ) // Protect against mod_rewrite mimicry (but ! Apache)
    167                         echo '<p>' . __( 'If <code>mod_rewrite</code> is disabled, ask your administrator to enable that module, or look at the <a href="http://httpd.apache.org/docs/mod/mod_rewrite.html">Apache documentation</a> or <a href="http://www.google.com/search?q=apache+mod_rewrite">elsewhere</a> for help setting it up.' ) . '</p></div>';
     167                        echo '<p>' . sprintf( __( 'If %1$s is disabled, ask your administrator to enable that module, or look at the <a href="%2$s">Apache documentation</a> or <a href="%3$s">elsewhere</a> for help setting it up.' ), '<code>mod_rewrite</code>', 'http://httpd.apache.org/docs/mod/mod_rewrite.html', 'http://www.google.com/search?q=apache+mod_rewrite' ) . '</p></div>';
    168168        }
    169169
    170170        if ( allow_subdomain_install() && allow_subdirectory_install() ) : ?>
    171171                <h3><?php esc_html_e( 'Addresses of Sites in your Network' ); ?></h3>
    172                 <p><?php _e( 'Please choose whether you would like sites in your WordPress network to use sub-domains or sub-directories. <strong>You cannot change this later.</strong>' ); ?></p>
     172                <p><?php _e( 'Please choose whether you would like sites in your WordPress network to use sub-domains or sub-directories.' ); ?> <strong><?php _e( 'You cannot change this later.' ); ?></strong></p>
    173173                <p><?php _e( 'You will need a wildcard DNS record if you are going to use the virtual host (sub-domain) functionality.' ); ?></p>
    174174                <?php // @todo: Link to an MS readme? ?>
    175175                <table class="form-table">
     
    228228                        <tr>
    229229                                <th scope="row"><?php esc_html_e( 'Sub-directory Install' ); ?></th>
    230230                                <td><?php
    231                                         _e( 'Because you are using <code>localhost</code>, the sites in your WordPress network must use sub-directories. Consider using <code>localhost.localdomain</code> if you wish to use sub-domains.' );
     231                                        printf(
     232                                                /* translators: 1: localhost 2: localhost.localdomain */
     233                                                __( 'Because you are using %1$s, the sites in your WordPress network must use sub-directories. Consider using %2$s if you wish to use sub-domains.' ),
     234                                                '<code>localhost</code>',
     235                                                '<code>localhost.localdomain</code>'
     236                                        );
    232237                                        // Uh oh:
    233238                                        if ( !allow_subdirectory_install() )
    234239                                                echo ' <strong>' . __( 'Warning!' ) . ' ' . __( 'The main site in a sub-directory install will need to use a modified permalink structure, potentially breaking existing links.' ) . '</strong>';