Ticket #14107: upgrade-update.diff
| File upgrade-update.diff, 21.2 KB (added by , 13 years ago) |
|---|
-
wp-admin/includes/class-wp-ms-themes-list-table.php
205 205 $text = _n( 'Disabled <span class="count">(%s)</span>', 'Disabled <span class="count">(%s)</span>', $count ); 206 206 break; 207 207 case 'upgrade': 208 $text = _n( 'Up grade Available <span class="count">(%s)</span>', 'Upgrade Available <span class="count">(%s)</span>', $count );208 $text = _n( 'Update Available <span class="count">(%s)</span>', 'Update Available <span class="count">(%s)</span>', $count ); 209 209 break; 210 210 case 'search': 211 211 $text = _n( 'Search Results <span class="count">(%s)</span>', 'Search Results <span class="count">(%s)</span>', $count ); -
wp-admin/includes/class-wp-plugins-list-table.php
233 233 $text = _n( 'Drop-ins <span class="count">(%s)</span>', 'Drop-ins <span class="count">(%s)</span>', $count ); 234 234 break; 235 235 case 'upgrade': 236 $text = _n( 'Up grade Available <span class="count">(%s)</span>', 'Upgrade Available <span class="count">(%s)</span>', $count );236 $text = _n( 'Update Available <span class="count">(%s)</span>', 'Update Available <span class="count">(%s)</span>', $count ); 237 237 break; 238 238 case 'search': 239 239 $text = _n( 'Search Results <span class="count">(%s)</span>', 'Search Results <span class="count">(%s)</span>', $count ); -
wp-admin/includes/class-wp-upgrader.php
368 368 369 369 function upgrade_strings() { 370 370 $this->strings['up_to_date'] = __('The plugin is at the latest version.'); 371 $this->strings['no_package'] = __('Up grade package not available.');371 $this->strings['no_package'] = __('Update package not available.'); 372 372 $this->strings['downloading_package'] = __('Downloading update from <span class="code">%s</span>…'); 373 373 $this->strings['unpack_package'] = __('Unpacking the update…'); 374 374 $this->strings['deactivate_plugin'] = __('Deactivating the plugin…'); 375 375 $this->strings['remove_old'] = __('Removing the old version of the plugin…'); 376 376 $this->strings['remove_old_failed'] = __('Could not remove the old plugin.'); 377 $this->strings['process_failed'] = __('Plugin up grade failed.');378 $this->strings['process_success'] = __('Plugin up graded successfully.');377 $this->strings['process_failed'] = __('Plugin update failed.'); 378 $this->strings['process_success'] = __('Plugin updated successfully.'); 379 379 } 380 380 381 381 function install_strings() { … … 608 608 609 609 function upgrade_strings() { 610 610 $this->strings['up_to_date'] = __('The theme is at the latest version.'); 611 $this->strings['no_package'] = __('Up grade package not available.');611 $this->strings['no_package'] = __('Update package not available.'); 612 612 $this->strings['downloading_package'] = __('Downloading update from <span class="code">%s</span>…'); 613 613 $this->strings['unpack_package'] = __('Unpacking the update…'); 614 614 $this->strings['remove_old'] = __('Removing the old version of the theme…'); 615 615 $this->strings['remove_old_failed'] = __('Could not remove the old theme.'); 616 $this->strings['process_failed'] = __('Theme up grade failed.');617 $this->strings['process_success'] = __('Theme up graded successfully.');616 $this->strings['process_failed'] = __('Theme update failed.'); 617 $this->strings['process_success'] = __('Theme updated successfully.'); 618 618 } 619 619 620 620 function install_strings() { … … 861 861 862 862 function upgrade_strings() { 863 863 $this->strings['up_to_date'] = __('WordPress is at the latest version.'); 864 $this->strings['no_package'] = __('Up grade package not available.');864 $this->strings['no_package'] = __('Update package not available.'); 865 865 $this->strings['downloading_package'] = __('Downloading update from <span class="code">%s</span>…'); 866 866 $this->strings['unpack_package'] = __('Unpacking the update…'); 867 867 $this->strings['copy_failed'] = __('Could not copy files.'); … … 1017 1017 } 1018 1018 1019 1019 function __construct($args = array()) { 1020 $defaults = array( 'url' => '', 'plugin' => '', 'nonce' => '', 'title' => __('Up grade Plugin') );1020 $defaults = array( 'url' => '', 'plugin' => '', 'nonce' => '', 'title' => __('Update Plugin') ); 1021 1021 $args = wp_parse_args($args, $defaults); 1022 1022 1023 1023 $this->plugin = $args['plugin']; … … 1388 1388 } 1389 1389 1390 1390 function __construct($args = array()) { 1391 $defaults = array( 'url' => '', 'theme' => '', 'nonce' => '', 'title' => __('Up grade Theme') );1391 $defaults = array( 'url' => '', 'theme' => '', 'nonce' => '', 'title' => __('Update Theme') ); 1392 1392 $args = wp_parse_args($args, $defaults); 1393 1393 1394 1394 $this->theme = $args['theme']; -
wp-admin/includes/theme.php
239 239 $theme_name = is_object($theme) ? $theme->name : (is_array($theme) ? $theme['Name'] : ''); 240 240 $details_url = add_query_arg(array('TB_iframe' => 'true', 'width' => 1024, 'height' => 800), $update['url']); //Theme browser inside WP? replace this, Also, theme preview JS will override this on the available list. 241 241 $update_url = wp_nonce_url('update.php?action=upgrade-theme&theme=' . urlencode($stylesheet), 'upgrade-theme_' . $stylesheet); 242 $update_onclick = 'onclick="if ( confirm(\'' . esc_js( __("Upgrading this theme will lose any customizations you have made. 'Cancel' to stop, 'OK' to up grade.") ) . '\') ) {return true;}return false;"';242 $update_onclick = 'onclick="if ( confirm(\'' . esc_js( __("Upgrading this theme will lose any customizations you have made. 'Cancel' to stop, 'OK' to update.") ) . '\') ) {return true;}return false;"'; 243 243 244 244 if ( ! current_user_can('update_themes') ) 245 245 printf( '<p><strong>' . __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%1$s">View version %3$s details</a>.') . '</strong></p>', $theme_name, $details_url, $update['new_version']); 246 246 else if ( empty($update['package']) ) 247 printf( '<p><strong>' . __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%1$s">View version %3$s details</a>. <em>Automatic up grade is unavailable for this theme.</em>') . '</strong></p>', $theme_name, $details_url, $update['new_version']);247 printf( '<p><strong>' . __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%1$s">View version %3$s details</a>. <em>Automatic update is unavailable for this theme.</em>') . '</strong></p>', $theme_name, $details_url, $update['new_version']); 248 248 else 249 printf( '<p><strong>' . __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%1$s">View version %3$s details</a> or <a href="%4$s" %5$s>up grade automatically</a>.') . '</strong></p>', $theme_name, $details_url, $update['new_version'], $update_url, $update_onclick );249 printf( '<p><strong>' . __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%1$s">View version %3$s details</a> or <a href="%4$s" %5$s>update automatically</a>.') . '</strong></p>', $theme_name, $details_url, $update['new_version'], $update_url, $update_onclick ); 250 250 } 251 251 } 252 252 -
wp-admin/includes/update.php
199 199 if ( ! current_user_can('update_plugins') ) 200 200 printf( __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%3$s">View version %4$s details</a>.'), $plugin_name, esc_url($details_url), esc_attr($plugin_name), $r->new_version ); 201 201 else if ( empty($r->package) ) 202 printf( __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%3$s">View version %4$s details</a>. <em>Automatic up grade is unavailable for this plugin.</em>'), $plugin_name, esc_url($details_url), esc_attr($plugin_name), $r->new_version );202 printf( __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%3$s">View version %4$s details</a>. <em>Automatic update is unavailable for this plugin.</em>'), $plugin_name, esc_url($details_url), esc_attr($plugin_name), $r->new_version ); 203 203 else 204 printf( __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%3$s">View version %4$s details</a> or <a href="%5$s">up grade automatically</a>.'), $plugin_name, esc_url($details_url), esc_attr($plugin_name), $r->new_version, wp_nonce_url( self_admin_url('update.php?action=upgrade-plugin&plugin=') . $file, 'upgrade-plugin_' . $file) );204 printf( __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%3$s">View version %4$s details</a> or <a href="%5$s">update automatically</a>.'), $plugin_name, esc_url($details_url), esc_attr($plugin_name), $r->new_version, wp_nonce_url( self_admin_url('update.php?action=upgrade-plugin&plugin=') . $file, 'upgrade-plugin_' . $file) ); 205 205 } 206 206 207 207 do_action( "in_plugin_update_message-$file", $plugin_data, $r ); … … 274 274 if ( ! current_user_can('update_themes') ) 275 275 printf( __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%3$s">View version %4$s details</a>.'), $theme['Name'], esc_url($details_url), esc_attr($theme['Name']), $r->new_version ); 276 276 else if ( empty( $r['package'] ) ) 277 printf( __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%3$s">View version %4$s details</a>. <em>Automatic up grade is unavailable for this plugin.</em>'), $theme['Name'], esc_url($details_url), esc_attr($theme['Name']), $r['new_version'] );277 printf( __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%3$s">View version %4$s details</a>. <em>Automatic update is unavailable for this plugin.</em>'), $theme['Name'], esc_url($details_url), esc_attr($theme['Name']), $r['new_version'] ); 278 278 else 279 printf( __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%3$s">View version %4$s details</a> or <a href="%5$s">up grade automatically</a>.'), $theme['Name'], esc_url($details_url), esc_attr($theme['Name']), $r['new_version'], wp_nonce_url( self_admin_url('update.php?action=upgrade-theme&theme=') . $theme_key, 'upgrade-theme_' . $theme_key) );279 printf( __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%3$s">View version %4$s details</a> or <a href="%5$s">update automatically</a>.'), $theme['Name'], esc_url($details_url), esc_attr($theme['Name']), $r['new_version'], wp_nonce_url( self_admin_url('update.php?action=upgrade-theme&theme=') . $theme_key, 'upgrade-theme_' . $theme_key) ); 280 280 281 281 do_action( "in_theme_update_message-$theme_key", $theme, $r ); 282 282 -
wp-admin/includes/upgrade.php
1656 1656 } 1657 1657 1658 1658 // Add a theme header. 1659 $header = "/*\nTheme Name: $theme_name\nTheme URI: " . __get_option('siteurl') . "\nDescription: A theme automatically created by the up grade.\nVersion: 1.0\nAuthor: Moi\n*/\n";1659 $header = "/*\nTheme Name: $theme_name\nTheme URI: " . __get_option('siteurl') . "\nDescription: A theme automatically created by the update.\nVersion: 1.0\nAuthor: Moi\n*/\n"; 1660 1660 1661 1661 $stylelines = file_get_contents("$site_dir/style.css"); 1662 1662 if ($stylelines) { -
wp-admin/network/upgrade.php
19 19 $parent_file = 'upgrade.php'; 20 20 21 21 add_contextual_help($current_screen, 22 '<p>' . __('Only use this screen once you have updated to a new version of WordPress through Dashboard > Updates. Clicking the Update Network button will step through each site in the network, five at a time, and make sure any database up grades are applied.') . '</p>' .22 '<p>' . __('Only use this screen once you have updated to a new version of WordPress through Dashboard > Updates. Clicking the Update Network button will step through each site in the network, five at a time, and make sure any database updates are applied.') . '</p>' . 23 23 '<p>' . __('If a version update to core has not happened, clicking this button won’t affect anything.') . '</p>' . 24 24 '<p>' . __('If this process fails for any reason, users logging in to their sites will force the same update.') . '</p>' . 25 25 '<p><strong>' . __('For more information:') . '</strong></p>' . -
wp-admin/plugins.php
98 98 else 99 99 $plugins = array(); 100 100 101 $title = __( 'Up grade Plugins' );101 $title = __( 'Update Plugins' ); 102 102 $parent_file = 'plugins.php'; 103 103 104 104 require_once(ABSPATH . 'wp-admin/admin-header.php'); -
wp-admin/update-core.php
70 70 if ( 'en_US' != $update->locale && ( !isset($wp_local_package) || $wp_local_package != $update->locale ) ) 71 71 echo '<p class="hint">'.__('This localized version contains both the translation and various other localization fixes. You can skip upgrading if you want to keep your current translation.').'</p>'; 72 72 else if ( 'en_US' == $update->locale && get_locale() != 'en_US' ) { 73 echo '<p class="hint">'.sprintf( __('You are about to install WordPress %s <strong>in English (US).</strong> There is a chance this up grade will break your translation. You may prefer to wait for the localized version to be released.'), $update->current ).'</p>';73 echo '<p class="hint">'.sprintf( __('You are about to install WordPress %s <strong>in English (US).</strong> There is a chance this update will break your translation. You may prefer to wait for the localized version to be released.'), $update->current ).'</p>'; 74 74 } 75 75 echo '</form>'; 76 76 … … 392 392 add_contextual_help($current_screen, 393 393 '<p>' . __('This screen lets you update to the latest version of WordPress as well as update your themes and plugins from the WordPress.org repository. When updates are available, the number of available updates will appear in a bubble on the left hand menu as a notification. It is very important to keep your WordPress installation up to date for security reasons, so when you see a number appear, make sure you take the time to update, which is an easy process.') . '</p>' . 394 394 '<p>' . __('Updating your WordPress installation is a simple one-click procedure; just click on the Update button when it says a new version is available.') . '</p>' . 395 '<p>' . __('To up grade themes or plugins from this screen, use the checkboxes to make your selection and click on the appropriate Update button. Check the box at the top of the Themes or Plugins section to select all and update them all at once.') . '</p>' .395 '<p>' . __('To update themes or plugins from this screen, use the checkboxes to make your selection and click on the appropriate Update button. Check the box at the top of the Themes or Plugins section to select all and update them all at once.') . '</p>' . 396 396 '<p><strong>' . __('For more information:') . '</strong></p>' . 397 397 '<p>' . __('<a href="http://codex.wordpress.org/Dashboard_Updates_SubPanel" target="_blank">Documentation on Updating WordPress</a>') . '</p>' . 398 398 '<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>' -
wp-admin/upgrade.php
46 46 <html xmlns="http://www.w3.org/1999/xhtml" <?php language_attributes(); ?>> 47 47 <head> 48 48 <meta http-equiv="Content-Type" content="<?php bloginfo( 'html_type' ); ?>; charset=<?php echo get_option( 'blog_charset' ); ?>" /> 49 <title><?php _e( 'WordPress › Up grade' ); ?></title>49 <title><?php _e( 'WordPress › Update' ); ?></title> 50 50 <?php 51 51 wp_admin_css( 'install', true ); 52 52 wp_admin_css( 'ie', true ); … … 57 57 58 58 <?php if ( get_option( 'db_version' ) == $wp_db_version || !is_blog_installed() ) : ?> 59 59 60 <h2><?php _e( 'No Up grade Required' ); ?></h2>60 <h2><?php _e( 'No Update Required' ); ?></h2> 61 61 <p><?php _e( 'Your WordPress database is already up-to-date!' ); ?></p> 62 62 <p class="step"><a class="button" href="<?php echo get_option( 'home' ); ?>/"><?php _e( 'Continue' ); ?></a></p> 63 63 64 64 <?php elseif ( !$php_compat || !$mysql_compat ) : 65 65 if ( !$mysql_compat && !$php_compat ) 66 printf( __('You cannot up grade 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 );66 printf( __('You cannot update 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 ); 67 67 elseif ( !$php_compat ) 68 printf( __('You cannot u pgrade 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 );68 printf( __('You cannot udate 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 ); 69 69 elseif ( !$mysql_compat ) 70 printf( __('You cannot up grade 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 );70 printf( __('You cannot update 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 ); 71 71 ?> 72 72 <?php else : 73 73 switch ( $step ) : … … 76 76 $goback = esc_url_raw( $goback ); 77 77 $goback = urlencode( $goback ); 78 78 ?> 79 <h2><?php _e( 'Database Up grade Required' ); ?></h2>80 <p><?php _e( 'WordPress has been updated! Before we send you on your way, we have to up grade your database to the newest version.' ); ?></p>81 <p><?php _e( 'The up grade process may take a little while, so please be patient.' ); ?></p>82 <p class="step"><a class="button" href="upgrade.php?step=1&backto=<?php echo $goback; ?>"><?php _e( 'Up grade WordPress Database' ); ?></a></p>79 <h2><?php _e( 'Database Update Required' ); ?></h2> 80 <p><?php _e( 'WordPress has been updated! Before we send you on your way, we have to update your database to the newest version.' ); ?></p> 81 <p><?php _e( 'The update process may take a little while, so please be patient.' ); ?></p> 82 <p class="step"><a class="button" href="upgrade.php?step=1&backto=<?php echo $goback; ?>"><?php _e( 'Update WordPress Database' ); ?></a></p> 83 83 <?php 84 84 break; 85 85 case 1: … … 89 89 $backto = esc_url_raw( $backto ); 90 90 $backto = wp_validate_redirect($backto, __get_option( 'home' ) . '/'); 91 91 ?> 92 <h2><?php _e( 'Up grade Complete' ); ?></h2>93 <p><?php _e( 'Your WordPress database has been successfully up graded!' ); ?></p>92 <h2><?php _e( 'Update Complete' ); ?></h2> 93 <p><?php _e( 'Your WordPress database has been successfully updated!' ); ?></p> 94 94 <p class="step"><a class="button" href="<?php echo $backto; ?>"><?php _e( 'Continue' ); ?></a></p> 95 95 96 96 <!-- -
wp-includes/functions.php
2596 2596 $trans['edit']['plugin'] = array( __( 'Your attempt to edit this plugin file: “%s” has failed.' ), 'use_id' ); 2597 2597 $trans['activate']['plugin'] = array( __( 'Your attempt to activate this plugin: “%s” has failed.' ), 'use_id' ); 2598 2598 $trans['deactivate']['plugin'] = array( __( 'Your attempt to deactivate this plugin: “%s” has failed.' ), 'use_id' ); 2599 $trans['upgrade']['plugin'] = array( __( 'Your attempt to up grade this plugin: “%s” has failed.' ), 'use_id' );2599 $trans['upgrade']['plugin'] = array( __( 'Your attempt to update this plugin: “%s” has failed.' ), 'use_id' ); 2600 2600 2601 2601 $trans['add']['post'] = array( __( 'Your attempt to add this post has failed.' ), false ); 2602 2602 $trans['delete']['post'] = array( __( 'Your attempt to delete this post: “%s” has failed.' ), 'get_the_title' );