<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[35557] trunk/src/wp-admin/setup-config.php: Remove `<code>` tags from translatable strings in `wp-admin/setup-config.php`.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/35557">35557</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/35557","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-11-06 17:21:33 +0000 (Fri, 06 Nov 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Remove `<code>` tags from translatable strings in `wp-admin/setup-config.php`.
Add translator comments.
Props ramiy.
Fixes <a href="https://core.trac.wordpress.org/ticket/34579">#34579</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminsetupconfigphp">trunk/src/wp-admin/setup-config.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminsetupconfigphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/setup-config.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/setup-config.php 2015-11-06 16:36:57 UTC (rev 35556)
+++ trunk/src/wp-admin/setup-config.php 2015-11-06 17:21:33 UTC (rev 35557)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -50,11 +50,21 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check if wp-config.php has been created
</span><span class="cx" style="display: block; padding: 0 10px"> if ( file_exists( ABSPATH . 'wp-config.php' ) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( '<p>' . sprintf( __( "The file 'wp-config.php' already exists. 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>' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( '<p>' . sprintf(
+ /* translators: %s: install.php */
+ __( "The file 'wp-config.php' already exists. 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>'
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check if wp-config.php exists above the root directory but is not part of another install
</span><span class="cx" style="display: block; padding: 0 10px"> if ( @file_exists( ABSPATH . '../wp-config.php' ) && ! @file_exists( ABSPATH . '../wp-settings.php' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 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>' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( '<p>' . sprintf(
+ /* translators: %s: install.php */
+ __( "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>'
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $step = isset( $_GET['step'] ) ? (int) $_GET['step'] : -1;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -139,12 +149,26 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <li><?php _e( 'Database host' ); ?></li>
</span><span class="cx" style="display: block; padding: 0 10px"> <li><?php _e( 'Table prefix (if you want to run more than one WordPress in a single database)' ); ?></li>
</span><span class="cx" style="display: block; padding: 0 10px"> </ol>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<p>
- <?php _e( 'We’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’t work, don’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>." ); ?>
-</p>
-<p><?php _e( "In all likelihood, these items were supplied to you by your Web Host. If you don’t have this information, then you will need to contact them before you can continue. If you’re all ready…" ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<p><?php
+ /* translators: %s: wp-config.php */
+ printf( __( 'We’re going to use this information to create a %s file.' ),
+ '<code>wp-config.php</code>'
+ );
+ ?>
+ <strong><?php
+ /* translators: 1: wp-config-sample.php, 2: wp-config.php */
+ printf( __( 'If for any reason this automatic file creation doesn’t work, don’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
+ /* translators: %s: Codex URL */
+ 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’t have this information, then you will need to contact them before you can continue. If you’re all ready…' ); ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="step"><a href="<?php echo $step_1; ?>" class="button button-large"><?php _e( 'Let’s go!' ); ?></a></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -158,7 +182,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <h1 class="screen-reader-text"><?php _e( 'Setup your database connection' ) ?></h1>
</span><span class="cx" style="display: block; padding: 0 10px"> <form method="post" action="setup-config.php?step=2">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p><?php _e( "Below you should enter your database connection details. If you’re not sure about these, contact your host." ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p><?php _e( 'Below you should enter your database connection details. If you’re not sure about these, contact your host.' ); ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px"> <table class="form-table">
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><label for="dbname"><?php _e( 'Database Name' ); ?></label></th>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -178,7 +202,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><label for="dbhost"><?php _e( 'Database Host' ); ?></label></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td><input name="dbhost" id="dbhost" type="text" size="25" value="localhost" /></td>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <td><?php _e( 'You should be able to get this info from your web host, if <code>localhost</code> doesn’t work.' ); ?></td>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <td><?php
+ /* translators: %s: localhost */
+ printf( __( 'You should be able to get this info from your web host, if %s doesn’t work.' ),'<code>localhost</code>' );
+ ?></td>
</ins><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><label for="prefix"><?php _e( 'Table Prefix' ); ?></label></th>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -309,8 +336,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_writable(ABSPATH) ) :
</span><span class="cx" style="display: block; padding: 0 10px"> setup_config_display_header();
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<p><?php _e( "Sorry, but I can’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>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<p><?php
+ /* translators: %s: wp-config.php */
+ printf( __( 'Sorry, but I can’t write the %s file.' ), '<code>wp-config.php</code>' );
+?></p>
+<p><?php
+ /* translators: %s: wp-config.php */
+ printf( __( 'You can create the %s manually and paste the following text into it.' ), '<code>wp-config.php</code>' );
+?></p>
</ins><span class="cx" style="display: block; padding: 0 10px"> <textarea id="wp-config" cols="98" rows="15" class="code" readonly="readonly"><?php
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $config_file as $line ) {
</span><span class="cx" style="display: block; padding: 0 10px"> echo htmlentities($line, ENT_COMPAT, 'UTF-8');
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -347,7 +380,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> setup_config_display_header();
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <h1 class="screen-reader-text"><?php _e( 'Successful database connection' ) ?></h1>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<p><?php _e( "All right, sparky! You’ve made it through this part of the installation. WordPress can now communicate with your database. If you are ready, time now to…" ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<p><?php _e( 'All right, sparky! You’ve made it through this part of the installation. WordPress can now communicate with your database. If you are ready, time now to…' ); ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="step"><a href="<?php echo $install; ?>" class="button button-large"><?php _e( 'Run the install' ); ?></a></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span></span></pre>
</div>
</div>
</body>
</html>