WordPress.org

Make WordPress Core

Changeset 35552


Ignore:
Timestamp:
11/06/2015 12:59:01 AM (6 years ago)
Author:
SergeyBiryukov
Message:

Remove <code> tags from translatable strings in wp-admin/includes/network.php.

Add translator comments.

Props ramiy.
Fixes #34598.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-admin/includes/network.php

    r35170 r35552  
    160160    } else {
    161161        $subdomain_install = false;
    162         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>';
    164         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>';
    166         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>';
     162        if ( $got_mod_rewrite = got_mod_rewrite() ) { // dangerous assumptions
     163            echo '<div class="updated inline"><p><strong>' . __( 'Note:' ) . '</strong> ';
     164            /* translators: %s: mod_rewrite */
     165            printf( __( 'Please make sure the Apache %s module is installed as it will be used at the end of this installation.' ),
     166                '<code>mod_rewrite</code>'
     167            );
     168            echo '</p>';
     169        } elseif ( $is_apache ) {
     170            echo '<div class="error inline"><p><strong>' . __( 'Warning!' ) . '</strong> ';
     171            /* translators: %s: mod_rewrite */
     172            printf( __( 'It looks like the Apache %s module is not installed.' ),
     173                '<code>mod_rewrite</code>'
     174            );
     175            echo '</p>';
     176        }
     177
     178        if ( $got_mod_rewrite || $is_apache ) { // Protect against mod_rewrite mimicry (but ! Apache)
     179            echo '<p>';
     180            /* translators: 1: mod_rewrite, 2: mod_rewrite documentation URL, 3: Google search for mod_rewrite */
     181            printf( __( '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.' ),
     182                '<code>mod_rewrite</code>',
     183                'http://httpd.apache.org/docs/mod/mod_rewrite.html',
     184                'http://www.google.com/search?q=apache+mod_rewrite'
     185            );
     186            echo '</p></div>';
     187        }
    168188    }
    169189
    170190    if ( allow_subdomain_install() && allow_subdirectory_install() ) : ?>
    171191        <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>
     192        <p><?php _e( 'Please choose whether you would like sites in your WordPress network to use sub-domains or sub-directories.' ); ?>
     193            <strong><?php _e( 'You cannot change this later.' ); ?></strong></p>
    173194        <p><?php _e( 'You will need a wildcard DNS record if you are going to use the virtual host (sub-domain) functionality.' ); ?></p>
    174195        <?php // @todo: Link to an MS readme? ?>
     
    229250                <th scope="row"><?php esc_html_e( 'Sub-directory Install' ); ?></th>
    230251                <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.' );
     252                    printf(
     253                        /* translators: 1: localhost 2: localhost.localdomain */
     254                        __( '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.' ),
     255                        '<code>localhost</code>',
     256                        '<code>localhost.localdomain</code>'
     257                    );
    232258                    // Uh oh:
    233259                    if ( !allow_subdirectory_install() )
Note: See TracChangeset for help on using the changeset viewer.