WordPress.org

Make WordPress Core

Changeset 13590


Ignore:
Timestamp:
03/04/2010 11:28:15 PM (12 years ago)
Author:
wpmuguru
Message:

UI upgrade -> update, see #12517

Location:
trunk/wp-admin
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/includes/ms.php

    r13586 r13590  
    667667        return false;
    668668    if ( get_site_option( 'wpmu_upgrade_site' ) != $wp_db_version )
    669         echo "<div id='update-nag'>" . __( 'Thank you for Upgrading! Please visit the <a href="ms-upgrade-network.php">Upgrade Network</a> page to update all your sites.' ) . "</div>";
     669        echo "<div id='update-nag'>" . __( 'Thank you for Updating! Please visit the <a href="ms-upgrade-network.php">Update Network</a> page to update all your sites.' ) . "</div>";
    670670}
    671671add_action( 'admin_notices', 'site_admin_notice' );
  • trunk/wp-admin/menu.php

    r13589 r13590  
    3535    $submenu[ 'ms-admin.php' ][20] = array( __('Themes'), 'manage_network_themes', 'ms-themes.php' );
    3636    $submenu[ 'ms-admin.php' ][25] = array( __('Options'), 'manage_network_options', 'ms-options.php' );
    37     $submenu[ 'ms-admin.php' ][30] = array( __('Upgrade'), 'manage_network', 'ms-upgrade-network.php' );
     37    $submenu[ 'ms-admin.php' ][30] = array( __('Update'), 'manage_network', 'ms-upgrade-network.php' );
    3838
    3939    $menu[1] = array( '', 'read', 'separator1', '', 'wp-menu-separator' );
  • trunk/wp-admin/ms-upgrade-network.php

    r13301 r13590  
    77require_once( ABSPATH . WPINC . '/http.php' );
    88
    9 $title = __('Upgrade Network');
     9$title = __('Update Network');
    1010$parent_file = 'ms-admin.php';
    1111require_once('admin-header.php');
     
    1616echo '<div class="wrap">';
    1717screen_icon();
    18 echo '<h2>'.__('Upgrade Network').'</h2>';
     18echo '<h2>'.__('Update Network').'</h2>';
    1919
    2020$action = isset($_GET['action']) ? $_GET['action'] : 'show';
     
    3838                    $response = wp_remote_get( trailingslashit( $siteurl ) . "wp-admin/upgrade.php?step=1", array( 'timeout' => 120, 'httpversion' => '1.1' ) );
    3939                    if ( is_wp_error( $response ) )
    40                         wp_die( "<strong>Warning!</strong> Problem upgrading {$siteurl}. Your server may not be able to connect to blogs running on it.<br /> Error message: <em>" . $response->get_error_message() ."</em>" );
     40                        wp_die( "<strong>Warning!</strong> Problem updating {$siteurl}. Your server may not be able to connect to sites running on it.<br /> Error message: <em>" . $response->get_error_message() ."</em>" );
    4141                    do_action( 'after_mu_upgrade', $response );
    4242                    do_action( 'wpmu_upgrade_site', $details[ 'blog_id' ] );
     
    5959    case 'show':
    6060    default:
    61         ?><p><?php _e("You can upgrade all the sites on your network through this page. It works by calling the upgrade script of each site automatically. Hit the link below to upgrade."); ?></p>
    62         <p><a class="button" href="ms-upgrade-network.php?action=upgrade"><?php _e("Upgrade Network"); ?></a></p><?php
     61        ?><p><?php _e("You can update all the sites on your network through this page. It works by calling the update script of each site automatically. Hit the link below to update."); ?></p>
     62        <p><a class="button" href="ms-upgrade-network.php?action=upgrade"><?php _e("Update Network"); ?></a></p><?php
    6363        do_action( 'wpmu_upgrade_page' );
    6464    break;
  • trunk/wp-admin/update-core.php

    r13588 r13590  
    2020    if ( !isset($update->response) || 'latest' == $update->response )
    2121        $current = true;
    22     $submit = __('Upgrade Automatically');
     22    $submit = __('Update Automatically');
    2323    $form_action = 'update-core.php?action=do-core-upgrade';
    2424    $php_version    = phpversion();
     
    2626    $show_buttons = true;
    2727    if ( 'development' == $update->response ) {
    28         $message = __('You are using a development version of WordPress.  You can upgrade to the latest nightly build automatically or download the nightly build and install it manually:');
     28        $message = __('You are using a development version of WordPress.  You can update to the latest nightly build automatically or download the nightly build and install it manually:');
    2929        $download = __('Download nightly build');
    3030    } else {
    3131        if ( $current ) {
    32             $message = sprintf(__('You have the latest version of WordPress. You do not need to upgrade. However, if you want to re-install version %s, you can do so automatically or download the package and re-install manually:'), $version_string);
     32            $message = sprintf(__('You have the latest version of WordPress. You do not need to update. However, if you want to re-install version %s, you can do so automatically or download the package and re-install manually:'), $version_string);
    3333            $submit = __('Re-install Automatically');
    3434            $form_action = 'update-core.php?action=do-core-reinstall';
     
    3737            $mysql_compat   = version_compare( $mysql_version, $update->mysql_version, '>=' ) || file_exists( WP_CONTENT_DIR . '/db.php' );
    3838            if ( !$mysql_compat && !$php_compat )
    39                 $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 );
     39                $message = sprintf( __('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.'), $update->current, $update->php_version, $update->mysql_version, $php_version, $mysql_version );
    4040            elseif ( !$php_compat )
    41                 $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 );
     41                $message = sprintf( __('You cannot update 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 );
    4242            elseif ( !$mysql_compat )
    43                 $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 );
     43                $message = sprintf( __('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.'), $update->current, $update->mysql_version, $mysql_version );
    4444            else
    45                 $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);
     45                $message =  sprintf(__('You can update 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);
    4646            if ( !$mysql_compat || !$php_compat )
    4747                $show_buttons = false;
     
    128128    if ( !isset($updates[0]->response) || 'latest' == $updates[0]->response ) {
    129129        echo '<h3>';
    130         _e('You have the latest version of WordPress. You do not need to upgrade');
     130        _e('You have the latest version of WordPress. You do not need to update');
    131131        echo '</h3>';
    132132    } else {
    133133        echo '<div class="updated"><p>';
    134         _e('<strong>Important:</strong> before upgrading, please <a href="http://codex.wordpress.org/WordPress_Backups">backup your database and files</a>.');
     134        _e('<strong>Important:</strong> before updating, please <a href="http://codex.wordpress.org/WordPress_Backups">backup your database and files</a>.');
    135135        echo '</p></div>';
    136136
    137137        echo '<h3 class="response">';
    138         _e( 'There is a new version of WordPress available for upgrade' );
     138        _e( 'There is a new version of WordPress available for update' );
    139139        echo '</h3>';
    140140    }
     
    176176    ?>
    177177<h3><?php _e('Plugins'); ?></h3>
    178 <p><?php _e('The following plugins have new versions available. Check the ones you want to upgrade and then click "Upgrade Plugins".'); ?></p>
     178<p><?php _e('The following plugins have new versions available. Check the ones you want to update and then click "Update Plugins".'); ?></p>
    179179<form method="post" action="<?php echo $form_action; ?>" name="upgrade-plugins" class="upgrade">
    180180<?php wp_nonce_field('upgrade-core'); ?>
    181 <p><input id="upgrade-plugins" class="button" type="submit" value="<?php esc_attr_e('Upgrade Plugins'); ?>" name="upgrade" /></p>
     181<p><input id="upgrade-plugins" class="button" type="submit" value="<?php esc_attr_e('Update Plugins'); ?>" name="upgrade" /></p>
    182182<table class="widefat" cellspacing="0" id="update-plugins-table">
    183183    <thead>
     
    225225    <tr class='active'>
    226226        <th scope='row' class='check-column'><input type='checkbox' name='checked[]' value='" . esc_attr($plugin_file) . "' /></th>
    227         <td class='plugin-title'><strong>{$plugin_data->Name}</strong>" . sprintf(__('You are running version %1$s. Upgrade to %2$s.'), $plugin_data->Version, $plugin_data->update->new_version) . $compat . $upgrade_notice . "</td>
     227        <td class='plugin-title'><strong>{$plugin_data->Name}</strong>" . sprintf(__('You are running version %1$s. Update to %2$s.'), $plugin_data->Version, $plugin_data->update->new_version) . $compat . $upgrade_notice . "</td>
    228228    </tr>";
    229229    }
     
    231231    </tbody>
    232232</table>
    233 <p><input id="upgrade-plugins-2" class="button" type="submit" value="<?php esc_attr_e('Upgrade Plugins'); ?>" name="upgrade" /></p>
     233<p><input id="upgrade-plugins-2" class="button" type="submit" value="<?php esc_attr_e('Update Plugins'); ?>" name="upgrade" /></p>
    234234</form>
    235235<?php
     
    303303    <div class="wrap">
    304304    <?php screen_icon(); ?>
    305     <h2><?php _e('Upgrade WordPress'); ?></h2>
     305    <h2><?php _e('Update WordPress'); ?></h2>
    306306<?php
    307307    if ( $wp_filesystem->errors->get_error_code() ) {
     
    322322            show_message( __('Installation Failed') );
    323323    } else {
    324         show_message( __('WordPress upgraded successfully') );
     324        show_message( __('WordPress updated successfully') );
    325325        show_message( '<strong>' . __('Actions:') . '</strong> <a href="' . esc_url( admin_url() ) . '">' . __('Go to Dashboard') . '</a>' );
    326326    }
Note: See TracChangeset for help on using the changeset viewer.