Changeset 27604

Timestamp:

03/19/2014 05:26:24 AM (12 years ago)

Author:

nacin

Message:

Combine two strings, using placeholders for filenames and avoiding HTML. see #27057.

File:

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

trunk/src/wp-admin/network.php

@@ -470 +470 @@
 </configuration>';
 
-        ?>
-                <li><p><?php printf( __( 'Add the following to your <code>web.config</code> file in <code>%s</code>, <strong>replacing</strong> other WordPress rules:' ), $home_path ); ?></p>
-                <?php
+                echo '<li><p>';
+                /* translators: 1: a filename like .htaccess. 2: a file path. */
+                printf( __( 'Add the following to your %1$s file in %2$s, <strong>replacing</strong> other WordPress rules:' ),
+                        '<code>web.config</code>', '<code>' . $home_path . '</code>' );
+                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>';
@@ -504 +506 @@
 EOF;
 
-                ?>
-                <li><p><?php printf( __( 'Add the following to your <code>.htaccess</code> file in <code>%s</code>, <strong>replacing</strong> other WordPress rules:' ), $home_path ); ?></p>
-                <?php
+                echo '<li><p>';
+                /* translators: 1: a filename like .htaccess. 2: a file path. */
+                printf( __( 'Add the following to your %1$s file in %2$s, <strong>replacing</strong> other WordPress rules:' ),
+                        '<code>.htaccess</code>', '<code>' . $home_path . '</code>' );
+                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>';