Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-01-10 18:37:58 +01:00
Code Issues Projects Releases Wiki Activity

I18N: Move the "Caution:" prefix to a separate string in wp-admin/includes/network.php.

Browse Source 
Props ramiy.
Fixes #35674.
Built from https://develop.svn.wordpress.org/trunk@36690


git-svn-id: http://core.svn.wordpress.org/trunk@36657 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2016-02-24 18:40:26 +00:00
parent 2214f69e43
commit 6f2fbfb28b
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
wp-admin/includes/network.php
View File

@ -376,23 +376,26 @@ function network_step2( $errors = false ) {
<p><?php _e( 'Complete the following steps to enable the features for creating a network of sites.' ); ?></p>
<div class="updated inline"><p><?php
if ( file_exists( $home_path . '.htaccess' ) ) {
echo '<strong>' . __( 'Caution:' ) . '</strong> ';
printf(
/* translators: 1: wp-config.php 2: .htaccess */
__( '<strong>Caution:</strong> We recommend you back up your existing %1$s and %2$s files.' ),
__( 'We recommend you back up your existing %1$s and %2$s files.' ),
'<code>wp-config.php</code>',
'<code>.htaccess</code>'
);
} elseif ( file_exists( $home_path . 'web.config' ) ) {
echo '<strong>' . __( 'Caution:' ) . '</strong> ';
printf(
/* translators: 1: wp-config.php 2: web.config */
__( '<strong>Caution:</strong> We recommend you back up your existing %1$s and %2$s files.' ),
__( 'We recommend you back up your existing %1$s and %2$s files.' ),
'<code>wp-config.php</code>',
'<code>web.config</code>'
);
} else {
echo '<strong>' . __( 'Caution:' ) . '</strong> ';
printf(
/* translators: 1: wp-config.php */
__( '<strong>Caution:</strong> We recommend you back up your existing %s file.' ),
__( 'We recommend you back up your existing %s file.' ),
'<code>wp-config.php</code>'
);
}

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.5-alpha-36689';
$wp_version = '4.5-alpha-36690';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.