Remove `<code>` tags from translatable strings in `wp-admin/setup-config.php`.
Add translator comments. Props ramiy. Fixes #34579. Built from https://develop.svn.wordpress.org/trunk@35557 git-svn-id: http://core.svn.wordpress.org/trunk@35521 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
2583c1e4ec
commit
9dd3f6fb16
|
@ -50,11 +50,21 @@ else
|
||||||
|
|
||||||
// Check if wp-config.php has been created
|
// Check if wp-config.php has been created
|
||||||
if ( file_exists( ABSPATH . 'wp-config.php' ) )
|
if ( file_exists( ABSPATH . 'wp-config.php' ) )
|
||||||
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>' );
|
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>'
|
||||||
|
);
|
||||||
|
|
||||||
// Check if wp-config.php exists above the root directory but is not part of another install
|
// 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' ) ) {
|
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(
|
||||||
|
/* 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>'
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
$step = isset( $_GET['step'] ) ? (int) $_GET['step'] : -1;
|
$step = isset( $_GET['step'] ) ? (int) $_GET['step'] : -1;
|
||||||
|
@ -139,12 +149,26 @@ switch($step) {
|
||||||
<li><?php _e( 'Database host' ); ?></li>
|
<li><?php _e( 'Database host' ); ?></li>
|
||||||
<li><?php _e( 'Table prefix (if you want to run more than one WordPress in a single database)' ); ?></li>
|
<li><?php _e( 'Table prefix (if you want to run more than one WordPress in a single database)' ); ?></li>
|
||||||
</ol>
|
</ol>
|
||||||
<p>
|
<p><?php
|
||||||
<?php _e( 'We’re going to use this information to create a <code>wp-config.php</code> file.' ); ?>
|
/* translators: %s: wp-config.php */
|
||||||
<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>
|
printf( __( 'We’re going to use this information to create a %s file.' ),
|
||||||
<?php _e( "Need more help? <a href='https://codex.wordpress.org/Editing_wp-config.php'>We got it</a>." ); ?>
|
'<code>wp-config.php</code>'
|
||||||
</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>
|
?>
|
||||||
|
<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>
|
||||||
|
|
||||||
<p class="step"><a href="<?php echo $step_1; ?>" class="button button-large"><?php _e( 'Let’s go!' ); ?></a></p>
|
<p class="step"><a href="<?php echo $step_1; ?>" class="button button-large"><?php _e( 'Let’s go!' ); ?></a></p>
|
||||||
<?php
|
<?php
|
||||||
|
@ -158,7 +182,7 @@ switch($step) {
|
||||||
?>
|
?>
|
||||||
<h1 class="screen-reader-text"><?php _e( 'Setup your database connection' ) ?></h1>
|
<h1 class="screen-reader-text"><?php _e( 'Setup your database connection' ) ?></h1>
|
||||||
<form method="post" action="setup-config.php?step=2">
|
<form method="post" action="setup-config.php?step=2">
|
||||||
<p><?php _e( "Below you should enter your database connection details. If you’re not sure about these, contact your host." ); ?></p>
|
<p><?php _e( 'Below you should enter your database connection details. If you’re not sure about these, contact your host.' ); ?></p>
|
||||||
<table class="form-table">
|
<table class="form-table">
|
||||||
<tr>
|
<tr>
|
||||||
<th scope="row"><label for="dbname"><?php _e( 'Database Name' ); ?></label></th>
|
<th scope="row"><label for="dbname"><?php _e( 'Database Name' ); ?></label></th>
|
||||||
|
@ -178,7 +202,10 @@ switch($step) {
|
||||||
<tr>
|
<tr>
|
||||||
<th scope="row"><label for="dbhost"><?php _e( 'Database Host' ); ?></label></th>
|
<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><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’t work.' ); ?></td>
|
<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>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<th scope="row"><label for="prefix"><?php _e( 'Table Prefix' ); ?></label></th>
|
<th scope="row"><label for="prefix"><?php _e( 'Table Prefix' ); ?></label></th>
|
||||||
|
@ -309,8 +336,14 @@ switch($step) {
|
||||||
if ( ! is_writable(ABSPATH) ) :
|
if ( ! is_writable(ABSPATH) ) :
|
||||||
setup_config_display_header();
|
setup_config_display_header();
|
||||||
?>
|
?>
|
||||||
<p><?php _e( "Sorry, but I can’t write the <code>wp-config.php</code> file." ); ?></p>
|
<p><?php
|
||||||
<p><?php _e( 'You can create the <code>wp-config.php</code> manually and paste the following text into it.' ); ?></p>
|
/* 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>
|
||||||
<textarea id="wp-config" cols="98" rows="15" class="code" readonly="readonly"><?php
|
<textarea id="wp-config" cols="98" rows="15" class="code" readonly="readonly"><?php
|
||||||
foreach ( $config_file as $line ) {
|
foreach ( $config_file as $line ) {
|
||||||
echo htmlentities($line, ENT_COMPAT, 'UTF-8');
|
echo htmlentities($line, ENT_COMPAT, 'UTF-8');
|
||||||
|
@ -347,7 +380,7 @@ if ( ! /iPad|iPod|iPhone/.test( navigator.userAgent ) ) {
|
||||||
setup_config_display_header();
|
setup_config_display_header();
|
||||||
?>
|
?>
|
||||||
<h1 class="screen-reader-text"><?php _e( 'Successful database connection' ) ?></h1>
|
<h1 class="screen-reader-text"><?php _e( 'Successful database connection' ) ?></h1>
|
||||||
<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>
|
<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>
|
||||||
|
|
||||||
<p class="step"><a href="<?php echo $install; ?>" class="button button-large"><?php _e( 'Run the install' ); ?></a></p>
|
<p class="step"><a href="<?php echo $install; ?>" class="button button-large"><?php _e( 'Run the install' ); ?></a></p>
|
||||||
<?php
|
<?php
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
*
|
*
|
||||||
* @global string $wp_version
|
* @global string $wp_version
|
||||||
*/
|
*/
|
||||||
$wp_version = '4.4-beta3-35556';
|
$wp_version = '4.4-beta3-35557';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
|
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
|
||||||
|
|
Loading…
Reference in New Issue