Changeset 704 for trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/xpress_upgrade.php

Timestamp:

Apr 20, 2011, 6:09:12 PM (14 years ago)

Author:

toemon

Message:

Fix ftp connection Err.
edit language

File:

• trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/xpress_upgrade.php (modified) (8 diffs)

trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/xpress_upgrade.php

@@ -32 +32 @@
                 } else if (version_compare($xpress_version, $latest_version, '<')) {
                         echo '<h3 class="response">';
-                        _e( 'An updated version of XPressME Integration Kit is available.' );
+                        _e( 'An updated version of XPressME Integration Kit is available.', 'xpressme' );
                         echo '</h3>';
 
@@ -40 +40 @@
                                 $download_diff .='</a>';
                         }
-                        $message =      sprintf(__('You can update to XPressME Integration Kit Ver %s</a> automatically or download the package and install it manually:'), $latest_version);
-                        $submit = __('Update Automatically');
+                        $message =      sprintf(__('You can update to XPressME Integration Kit Ver %s</a> automatically or download the package and install it manually:', 'xpressme'), $latest_version);
+                        $submit = __('Update Automatically', 'xpressme');
                         $form_action = 'admin.php?page=upgrade_page&action=do-xpress-upgrade';
                         $download = sprintf(__('Download %s', 'xpressme') , $latest_version);
@@ -48 +48 @@
                 } else {
                         echo '<h3>';
-                        printf(__('You have the latest version of XPressME Integration Kit Ver.%s.'),$xpress_version);
+                        printf(__('You have the latest version of XPressME Integration Kit Ver.%s.', 'xpressme'),$xpress_version);
                         echo '</h3>';
 
                         $message = __('You have the latest version of XPressME Integration Kit. You do not need to upgrade', 'xpressme');
-                        $submit = __('Re-install Automatically');
+                        $submit = __('Re-install Automatically', 'xpressme');
                         $form_action = 'update-core.php?action=do-core-reinstall';
 
@@ -70 +70 @@
                         $develop_show = true;
                         $develop_package=$latest['develop_package'];
-                        $develop_submit = __('Update Automatically');
+                        $develop_submit = __('Update Automatically', 'xpressme');
                         $develop_download = sprintf(__('Download %s', 'xpressme') , $develop_latest_version);
                         $develop_download_diff = '';
@@ -127 +127 @@
 
 function do_xpress_upgrade( $develop = false,$reinstall = false ) {
-        global $wp_filesystem;
+        global $wp_filesystem,$xoops_config;
 
         if ( $reinstall )
-                $url = 'update-xpress.php?action=do-xpress-reinstall';
-        else
-                $url = 'update-xpress.php?action=do-xpress-upgrade';
-        $url = wp_nonce_url($url, 'upgrade-xpress');
+                $url = 'admin.php?page=upgrade_page&action=do-xpress-reinstall';
+        else {
+                if(!$develop)
+                        $url = 'admin.php?page=upgrade_page&action=do-xpress-upgrade';
+                else
+                        $url = 'admin.php?page=upgrade_page&action=do-xpress-develop_upgrade';
+                $url = wp_nonce_url($url, 'upgrade-xpress');
+        }
         if ( false === ($credentials = request_filesystem_credentials($url, '', false, ABSPATH)) )
                 return;
@@ -153 +157 @@
         <div class="wrap">
         <?php screen_icon(); ?>
-        <h2><?php _e('Update XPressME Integration Kit'); ?></h2>
+        <h2><?php _e('Update XPressME Integration Kit', 'xpressme'); ?></h2>
 <?php
         if ( $wp_filesystem->errors->get_error_code() ) {
@@ -170 +174 @@
                 show_message($result);
                 if ('up_to_date' != $result->get_error_code() )
-                        show_message( __('Installation Failed') );
+                        show_message( __('Installation Failed', 'xpressme') );
         } else {
-                show_message( __('XPressME Integration Kit updated successfully') );
-                $update_url = 'http://localhost/cube/modules/xp_test/admin/update.php';
+                show_message( __('XPressME Integration Kit files updated successfully', 'xpressme') );
+                show_message( __('Please update the module. ', 'xpressme') );
+                
+                $update_url = $xoops_config->->module_url .'/admin/update.php';
                 show_message( '<strong>' . __('Actions:') . '</strong> <a href="' . esc_url( $update_url ) . '">' . __('Go to Module Update') . '</a>' );
         }
@@ -185 +191 @@
 {
         if ( ! current_user_can('update_plugins') )
-        wp_die(__('You do not have sufficient permissions to update XPressME Integration Kit for this site.'));
+        wp_die(__('You do not have sufficient permissions to update XPressME Integration Kit for this site.', 'xpressme'));
         $action = isset($_GET['action']) ? $_GET['action'] : 'upgrade-xpress';
         $upgrade_error = false;