From baa6ca4b2c8fdf668255f5d6443222553e48b0b5 Mon Sep 17 00:00:00 2001 From: nacin Date: Sat, 20 Feb 2010 12:28:10 +0000 Subject: [PATCH] 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 --- wp-admin/includes/update.php | 4 ++-- wp-admin/install.php | 6 +++--- wp-admin/update-core.php | 8 ++++---- wp-admin/upgrade.php | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/wp-admin/includes/update.php b/wp-admin/includes/update.php index d35245ab09..d3cdc3bd6c 100644 --- a/wp-admin/includes/update.php +++ b/wp-admin/includes/update.php @@ -130,9 +130,9 @@ function update_nag() { return false; if ( current_user_can('update_core') ) - $msg = sprintf( __('WordPress %1$s is available! Please update now.'), $cur->current, 'update-core.php' ); + $msg = sprintf( __('WordPress %1$s is available! Please update now.'), $cur->current, 'update-core.php' ); else - $msg = sprintf( __('WordPress %1$s is available! Please notify the site administrator.'), $cur->current ); + $msg = sprintf( __('WordPress %1$s is available! Please notify the site administrator.'), $cur->current ); echo "
$msg
"; } diff --git a/wp-admin/install.php b/wp-admin/install.php index 8622862210..bc5234cb1f 100644 --- a/wp-admin/install.php +++ b/wp-admin/install.php @@ -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 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 ); 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 WordPress %1$s 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 WordPress %1$s 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(); diff --git a/wp-admin/update-core.php b/wp-admin/update-core.php index 50b278e7e7..33914993c9 100644 --- a/wp-admin/update-core.php +++ b/wp-admin/update-core.php @@ -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 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 ); 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 WordPress %1$s 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 WordPress %1$s 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 WordPress %1$s automatically or download the package and install it manually:'), $version_string); if ( !$mysql_compat || !$php_compat ) $show_buttons = false; } diff --git a/wp-admin/upgrade.php b/wp-admin/upgrade.php index 6d25767864..638b07c4ea 100644 --- a/wp-admin/upgrade.php +++ b/wp-admin/upgrade.php @@ -60,11 +60,11 @@ $mysql_compat = version_compare( $mysql_version, $required_mysql_version, '>=' 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 ); 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 WordPress %1$s 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 WordPress %1$s requires MySQL version %2$s or higher. You are running version %3$s.'), $wp_version, $required_mysql_version, $mysql_version ); ?>