Ticket #34579: 34579.2.patch

wp-admin/setup-config.php

@@ -54 +54 @@
 
 // Check if wp-config.php exists above the root directory but is not part of another install
 if ( @file_exists( ABSPATH . '../wp-config.php' ) && ! @file_exists( ABSPATH . '../wp-settings.php' ) ) {
-        wp_die( '<p>' . sprintf( __( "The file 'wp-config.php' already exists one level above your WordPress installation. If you need to reset any of the configuration items in this file, please delete it first. You may try <a href='install.php'>installing now</a>."), 'install.php' ) . '</p>' );
+        wp_die( '<p>' . sprintf( __( "The file 'wp-config.php' already exists one level above your WordPress installation. If you need to reset any of the configuration items in this file, please delete it first. You may try <a href='%s'>installing now</a>."), 'install.php' ) . '</p>' );
 }
 
 $step = isset( $_GET['step'] ) ? (int) $_GET['step'] : -1;
@@ -139 +139 @@
         <li><?php _e( 'Table prefix (if you want to run more than one WordPress in a single database)' ); ?></li>
 </ol>
 <p>
-        <?php _e( 'We&#8217;re going to use this information to create a <code>wp-config.php</code> file.' ); ?>
-        <strong><?php _e( "If for any reason this automatic file creation doesn&#8217;t work, don&#8217;t worry. All this does is fill in the database information to a configuration file. You may also simply open <code>wp-config-sample.php</code> in a text editor, fill in your information, and save it as <code>wp-config.php</code>." ); ?></strong>
-        <?php _e( "Need more help? <a href='https://codex.wordpress.org/Editing_wp-config.php'>We got it</a>." ); ?>
+        <?php printf( __( 'We&#8217;re going to use this information to create a %s file.' ), '<code>wp-config.php</code>' ); ?>
+        <strong><?php printf( __( 'If for any reason this automatic file creation doesn&#8217;t work, don&#8217;t worry. All this does is fill in the database information to a configuration file. You may also simply open %1$s in a text editor, fill in your information, and save it as %2$s.' ), '<code>wp-config-sample.php</code>', '<code>wp-config.php</code>' ); ?></strong>
+        <?php printf( __( 'Need more help? <a href="%s">We got it</a>.' ), __( 'https://codex.wordpress.org/Editing_wp-config.php' ) ); ?>
 </p>
-<p><?php _e( "In all likelihood, these items were supplied to you by your Web Host. If you don&#8217;t have this information, then you will need to contact them before you can continue. If you&#8217;re all ready&hellip;" ); ?></p>
+<p><?php _e( 'In all likelihood, these items were supplied to you by your Web Host. If you don&#8217;t have this information, then you will need to contact them before you can continue. If you&#8217;re all ready&hellip;' ); ?></p>
 
 <p class="step"><a href="<?php echo $step_1; ?>" class="button button-large"><?php _e( 'Let&#8217;s go!' ); ?></a></p>
 <?php
@@ -156 +156 @@
                 setup_config_display_header();
         ?>
 <form method="post" action="setup-config.php?step=2">
-        <p><?php _e( "Below you should enter your database connection details. If you&#8217;re not sure about these, contact your host." ); ?></p>
+        <p><?php _e( 'Below you should enter your database connection details. If you&#8217;re not sure about these, contact your host.' ); ?></p>
         <table class="form-table">
                 <tr>
                         <th scope="row"><label for="dbname"><?php _e( 'Database Name' ); ?></label></th>
@@ -176 +176 @@
                 <tr>
                         <th scope="row"><label for="dbhost"><?php _e( 'Database Host' ); ?></label></th>
                         <td><input name="dbhost" id="dbhost" type="text" size="25" value="localhost" /></td>
-                        <td><?php _e( 'You should be able to get this info from your web host, if <code>localhost</code> doesn&#8217;t work.' ); ?></td>
+                        <td><?php printf( __( 'You should be able to get this info from your web host, if %s doesn&#8217;t work.' ), '<code>localhost</code>' ); ?></td>
                 </tr>
                 <tr>
                         <th scope="row"><label for="prefix"><?php _e( 'Table Prefix' ); ?></label></th>
@@ -307 +307 @@
         if ( ! is_writable(ABSPATH) ) :
                 setup_config_display_header();
 ?>
-<p><?php _e( "Sorry, but I can&#8217;t write the <code>wp-config.php</code> file." ); ?></p>
-<p><?php _e( 'You can create the <code>wp-config.php</code> manually and paste the following text into it.' ); ?></p>
+<p><?php printf( __( 'Sorry, but I can&#8217;t write the %s file.' ), '<code>wp-config.php</code>' ); ?></p>
+<p><?php printf( __( 'You can create the %s manually and paste the following text into it.' ), '<code>wp-config.php</code>' ); ?></p>
 <textarea id="wp-config" cols="98" rows="15" class="code" readonly="readonly"><?php
                 foreach ( $config_file as $line ) {
                         echo htmlentities($line, ENT_COMPAT, 'UTF-8');
@@ -344 +344 @@
                 chmod( $path_to_wp_config, 0666 );
                 setup_config_display_header();
 ?>
-<p><?php _e( "All right, sparky! You&#8217;ve made it through this part of the installation. WordPress can now communicate with your database. If you are ready, time now to&hellip;" ); ?></p>
+<p><?php _e( 'All right, sparky! You&#8217;ve made it through this part of the installation. WordPress can now communicate with your database. If you are ready, time now to&hellip;' ); ?></p>
 
 <p class="step"><a href="<?php echo $install; ?>" class="button button-large"><?php _e( 'Run the install' ); ?></a></p>
 <?php