Add links to the codex changelog in update notification strings. props dtoj, see #11739
git-svn-id: http://svn.automattic.com/wordpress/trunk@13250 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
39605976b1
commit
baa6ca4b2c
|
@ -130,9 +130,9 @@ function update_nag() {
|
|||
return false;
|
||||
|
||||
if ( current_user_can('update_core') )
|
||||
$msg = sprintf( __('WordPress %1$s is available! <a href="%2$s">Please update now</a>.'), $cur->current, 'update-core.php' );
|
||||
$msg = sprintf( __('<a href="http://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> is available! <a href="%2$s">Please update now</a>.'), $cur->current, 'update-core.php' );
|
||||
else
|
||||
$msg = sprintf( __('WordPress %1$s is available! Please notify the site administrator.'), $cur->current );
|
||||
$msg = sprintf( __('<a href="http://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> is available! Please notify the site administrator.'), $cur->current );
|
||||
|
||||
echo "<div id='update-nag'>$msg</div>";
|
||||
}
|
||||
|
|
|
@ -127,11 +127,11 @@ $php_compat = version_compare( $php_version, $required_php_version, '>=' );
|
|||
$mysql_compat = version_compare( $mysql_version, $required_mysql_version, '>=' ) || file_exists( WP_CONTENT_DIR . '/db.php' );
|
||||
|
||||
if ( !$mysql_compat && !$php_compat )
|
||||
$compat = sprintf( __('You cannot install because WordPress %1$s requires PHP version %2$s or higher and MySQL version %3$s or higher. You are running PHP version %4$s and MySQL version %5$s.'), $wp_version, $required_php_version, $required_mysql_version, $php_version, $mysql_version );
|
||||
$compat = sprintf( __('You cannot install because <a href="http://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires PHP version %2$s or higher and MySQL version %3$s or higher. You are running PHP version %4$s and MySQL version %5$s.'), $wp_version, $required_php_version, $required_mysql_version, $php_version, $mysql_version );
|
||||
elseif ( !$php_compat )
|
||||
$compat = sprintf( __('You cannot install because WordPress %1$s requires PHP version %2$s or higher. You are running version %3$s.'), $wp_version, $required_php_version, $php_version );
|
||||
$compat = sprintf( __('You cannot install because <a href="http://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires PHP version %2$s or higher. You are running version %3$s.'), $wp_version, $required_php_version, $php_version );
|
||||
elseif ( !$mysql_compat )
|
||||
$compat = sprintf( __('You cannot install because WordPress %1$s requires MySQL version %2$s or higher. You are running version %3$s.'), $wp_version, $required_mysql_version, $mysql_version );
|
||||
$compat = sprintf( __('You cannot install because <a href="http://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires MySQL version %2$s or higher. You are running version %3$s.'), $wp_version, $required_mysql_version, $mysql_version );
|
||||
|
||||
if ( !$mysql_compat || !$php_compat ) {
|
||||
display_header();
|
||||
|
|
|
@ -36,13 +36,13 @@ function list_core_update( $update ) {
|
|||
$php_compat = version_compare( $php_version, $update->php_version, '>=' );
|
||||
$mysql_compat = version_compare( $mysql_version, $update->mysql_version, '>=' ) || file_exists( WP_CONTENT_DIR . '/db.php' );
|
||||
if ( !$mysql_compat && !$php_compat )
|
||||
$message = sprintf( __('You cannot upgrade because WordPress %1$s requires PHP version %2$s or higher and MySQL version %3$s or higher. You are running PHP version %4$s and MySQL version %5$s.'), $update->current, $update->php_version, $update->mysql_version, $php_version, $mysql_version );
|
||||
$message = sprintf( __('You cannot upgrade because <a href="http://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires PHP version %2$s or higher and MySQL version %3$s or higher. You are running PHP version %4$s and MySQL version %5$s.'), $update->current, $update->php_version, $update->mysql_version, $php_version, $mysql_version );
|
||||
elseif ( !$php_compat )
|
||||
$message = sprintf( __('You cannot upgrade because WordPress %1$s requires PHP version %2$s or higher. You are running version %3$s.'), $update->current, $update->php_version, $php_version );
|
||||
$message = sprintf( __('You cannot upgrade because <a href="http://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires PHP version %2$s or higher. You are running version %3$s.'), $update->current, $update->php_version, $php_version );
|
||||
elseif ( !$mysql_compat )
|
||||
$message = sprintf( __('You cannot upgrade because WordPress %1$s requires MySQL version %2$s or higher. You are running version %3$s.'), $update->current, $update->mysql_version, $mysql_version );
|
||||
$message = sprintf( __('You cannot upgrade because <a href="http://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires MySQL version %2$s or higher. You are running version %3$s.'), $update->current, $update->mysql_version, $mysql_version );
|
||||
else
|
||||
$message = sprintf(__('You can upgrade to version %s automatically or download the package and install it manually:'), $version_string);
|
||||
$message = sprintf(__('You can upgrade to <a href="http://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> automatically or download the package and install it manually:'), $version_string);
|
||||
if ( !$mysql_compat || !$php_compat )
|
||||
$show_buttons = false;
|
||||
}
|
||||
|
|
|
@ -60,11 +60,11 @@ $mysql_compat = version_compare( $mysql_version, $required_mysql_version, '>='
|
|||
|
||||
<?php elseif ( !$php_compat || !$mysql_compat ) :
|
||||
if ( !$mysql_compat && !$php_compat )
|
||||
printf( __('You cannot upgrade because WordPress %1$s requires PHP version %2$s or higher and MySQL version %3$s or higher. You are running PHP version %4$s and MySQL version %5$s.'), $wp_version, $required_php_version, $required_mysql_version, $php_version, $mysql_version );
|
||||
printf( __('You cannot upgrade because <a href="http://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires PHP version %2$s or higher and MySQL version %3$s or higher. You are running PHP version %4$s and MySQL version %5$s.'), $wp_version, $required_php_version, $required_mysql_version, $php_version, $mysql_version );
|
||||
elseif ( !$php_compat )
|
||||
printf( __('You cannot upgrade because WordPress %1$s requires PHP version %2$s or higher. You are running version %3$s.'), $wp_version, $required_php_version, $php_version );
|
||||
printf( __('You cannot upgrade because <a href="http://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires PHP version %2$s or higher. You are running version %3$s.'), $wp_version, $required_php_version, $php_version );
|
||||
elseif ( !$mysql_compat )
|
||||
printf( __('You cannot upgrade because WordPress %1$s requires MySQL version %2$s or higher. You are running version %3$s.'), $wp_version, $required_mysql_version, $mysql_version );
|
||||
printf( __('You cannot upgrade because <a href="http://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires MySQL version %2$s or higher. You are running version %3$s.'), $wp_version, $required_mysql_version, $mysql_version );
|
||||
?>
|
||||
<?php else :
|
||||
switch ( $step ) :
|
||||
|
|
Loading…
Reference in New Issue