WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Consitent use of … Fixes #10374 props demetris. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@12533 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
westi 2009-12-24 09:46:57 +00:00
parent 81552ba995
commit 9ca731eee2
3 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
wp-admin/import/livejournal.php
View File

@ -842,7 +842,7 @@ class LJ_API_Import {
$this->ixr = new IXR_Client( $this->ixr_url, false, 80, 30 ); $this->ixr = new IXR_Client( $this->ixr_url, false, 80, 30 );
echo '<div id="ljapi-status">'; echo '<div id="ljapi-status">';
echo '<h3>' . __( 'Downloading Comments' ) . '</h3>'; echo '<h3>' . __( 'Downloading Comments&#8230;' ) . '</h3>';
echo '<p>' . __( 'Now we will download your comments so we can import them (this could take a <strong>long</strong> time if you have lots of comments)...' ) . '</p>'; echo '<p>' . __( 'Now we will download your comments so we can import them (this could take a <strong>long</strong> time if you have lots of comments)...' ) . '</p>';
ob_flush(); flush(); ob_flush(); flush();
@ -890,7 +890,7 @@ class LJ_API_Import {
update_option( 'ljapi_step', 3 ); update_option( 'ljapi_step', 3 );
echo '<div id="ljapi-status">'; echo '<div id="ljapi-status">';
echo '<h3>' . __( 'Threading Comments' ) . '</h3>'; echo '<h3>' . __( 'Threading Comments&#8230;' ) . '</h3>';
echo '<p>' . __( 'We are now re-building the threading of your comments (this can also take a while if you have lots of comments)...' ) . '</p>'; echo '<p>' . __( 'We are now re-building the threading of your comments (this can also take a while if you have lots of comments)...' ) . '</p>';
ob_flush(); flush(); ob_flush(); flush();
@ -963,12 +963,12 @@ class LJ_API_Import {
}); });
function ljapi_msg() { function ljapi_msg() {
str = '<?php _e( "Continuing in %d" ) ?>'; str = '<?php _e( "Continuing in %d&#8230;" ) ?>';
jQuery( '#<?php echo $msg ?>' ).text( str.replace( /%d/, next_counter ) ); jQuery( '#<?php echo $msg ?>' ).text( str.replace( /%d/, next_counter ) );
if ( next_counter <= 0 ) { if ( next_counter <= 0 ) {
if ( jQuery( '#<?php echo $id ?>' ).length ) { if ( jQuery( '#<?php echo $id ?>' ).length ) {
jQuery( "#<?php echo $id ?> input[type='submit']" ).hide(); jQuery( "#<?php echo $id ?> input[type='submit']" ).hide();
str = '<?php _e( "Continuing" ) ?> <img src="images/wpspin_light.gif" alt="" id="processing" align="top" />'; str = '<?php _e( "Continuing&#8230;" ) ?> <img src="images/wpspin_light.gif" alt="" id="processing" align="top" />';
jQuery( '#<?php echo $msg ?>' ).html( str ); jQuery( '#<?php echo $msg ?>' ).html( str );
jQuery( '#<?php echo $id ?>' ).submit(); jQuery( '#<?php echo $id ?>' ).submit();
return; return;
@ -991,7 +991,7 @@ class LJ_API_Import {
}); });
function ljapi_msg() { function ljapi_msg() {
str = '<?php _e( "Continuing in %d" ) ?>'; str = '<?php _e( "Continuing in %d&#8230;" ) ?>';
jQuery( '#<?php echo $msg ?>' ).text( str.replace( /%d/, next_counter ) ); jQuery( '#<?php echo $msg ?>' ).text( str.replace( /%d/, next_counter ) );
if ( next_counter <= 0 ) { if ( next_counter <= 0 ) {
if ( jQuery( '#<?php echo $id ?>' ).length ) { if ( jQuery( '#<?php echo $id ?>' ).length ) {

50
wp-admin/includes/class-wp-upgrader.php
View File

@ -51,13 +51,13 @@ class WP_Upgrader {
$this->strings['fs_no_folder'] = __('Unable to locate needed folder (%s).'); $this->strings['fs_no_folder'] = __('Unable to locate needed folder (%s).');
$this->strings['download_failed'] = __('Download failed.'); $this->strings['download_failed'] = __('Download failed.');
$this->strings['installing_package'] = __('Installing the latest version.'); $this->strings['installing_package'] = __('Installing the latest version&#8230;');
$this->strings['folder_exists'] = __('Destination folder already exists.'); $this->strings['folder_exists'] = __('Destination folder already exists.');
$this->strings['mkdir_failed'] = __('Could not create directory.'); $this->strings['mkdir_failed'] = __('Could not create directory.');
$this->strings['bad_package'] = __('Incompatible Archive'); $this->strings['bad_package'] = __('Incompatible Archive');
$this->strings['maintenance_start'] = __('Enabling Maintenance mode.'); $this->strings['maintenance_start'] = __('Enabling Maintenance mode&#8230;');
$this->strings['maintenance_end'] = __('Disabling Maintenance mode.'); $this->strings['maintenance_end'] = __('Disabling Maintenance mode&#8230;');
} }
function fs_connect( $directories = array() ) { function fs_connect( $directories = array() ) {
@ -366,22 +366,22 @@ class Plugin_Upgrader extends WP_Upgrader {
function upgrade_strings() { function upgrade_strings() {
$this->strings['up_to_date'] = __('The plugin is at the latest version.'); $this->strings['up_to_date'] = __('The plugin is at the latest version.');
$this->strings['no_package'] = __('Upgrade package not available.'); $this->strings['no_package'] = __('Upgrade package not available.');
$this->strings['downloading_package'] = __('Downloading update from <span class="code">%s</span>.'); $this->strings['downloading_package'] = __('Downloading update from <span class="code">%s</span>&#8230;');
$this->strings['unpack_package'] = __('Unpacking the update.'); $this->strings['unpack_package'] = __('Unpacking the update&#8230;');
$this->strings['deactivate_plugin'] = __('Deactivating the plugin.'); $this->strings['deactivate_plugin'] = __('Deactivating the plugin&#8230;');
$this->strings['remove_old'] = __('Removing the old version of the plugin.'); $this->strings['remove_old'] = __('Removing the old version of the plugin&#8230;');
$this->strings['remove_old_failed'] = __('Could not remove the old plugin.'); $this->strings['remove_old_failed'] = __('Could not remove the old plugin.');
$this->strings['process_failed'] = __('Plugin upgrade Failed.'); $this->strings['process_failed'] = __('Plugin upgrade failed.');
$this->strings['process_success'] = __('Plugin upgraded successfully.'); $this->strings['process_success'] = __('Plugin upgraded successfully.');
} }
function install_strings() { function install_strings() {
$this->strings['no_package'] = __('Install package not available.'); $this->strings['no_package'] = __('Install package not available.');
$this->strings['downloading_package'] = __('Downloading install package from <span class="code">%s</span>.'); $this->strings['downloading_package'] = __('Downloading install package from <span class="code">%s</span>&#8230;');
$this->strings['unpack_package'] = __('Unpacking the package.'); $this->strings['unpack_package'] = __('Unpacking the package&#8230;');
$this->strings['installing_package'] = __('Installing the plugin.'); $this->strings['installing_package'] = __('Installing the plugin&#8230;');
$this->strings['process_failed'] = __('Plugin Install Failed.'); $this->strings['process_failed'] = __('Plugin install failed.');
$this->strings['process_success'] = __('Plugin Installed successfully.'); $this->strings['process_success'] = __('Plugin installed successfully.');
} }
function install($package) { function install($package) {
@ -592,21 +592,21 @@ class Theme_Upgrader extends WP_Upgrader {
function upgrade_strings() { function upgrade_strings() {
$this->strings['up_to_date'] = __('The theme is at the latest version.'); $this->strings['up_to_date'] = __('The theme is at the latest version.');
$this->strings['no_package'] = __('Upgrade package not available.'); $this->strings['no_package'] = __('Upgrade package not available.');
$this->strings['downloading_package'] = __('Downloading update from <span class="code">%s</span>.'); $this->strings['downloading_package'] = __('Downloading update from <span class="code">%s</span>&#8230;');
$this->strings['unpack_package'] = __('Unpacking the update.'); $this->strings['unpack_package'] = __('Unpacking the update&#8230;');
$this->strings['remove_old'] = __('Removing the old version of the theme.'); $this->strings['remove_old'] = __('Removing the old version of the theme&#8230;');
$this->strings['remove_old_failed'] = __('Could not remove the old theme.'); $this->strings['remove_old_failed'] = __('Could not remove the old theme.');
$this->strings['process_failed'] = __('Theme upgrade Failed.'); $this->strings['process_failed'] = __('Theme upgrade failed.');
$this->strings['process_success'] = __('Theme upgraded successfully.'); $this->strings['process_success'] = __('Theme upgraded successfully.');
} }
function install_strings() { function install_strings() {
$this->strings['no_package'] = __('Install package not available.'); $this->strings['no_package'] = __('Install package not available.');
$this->strings['downloading_package'] = __('Downloading install package from <span class="code">%s</span>.'); $this->strings['downloading_package'] = __('Downloading install package from <span class="code">%s</span>&#8230;');
$this->strings['unpack_package'] = __('Unpacking the package.'); $this->strings['unpack_package'] = __('Unpacking the package&#8230;');
$this->strings['installing_package'] = __('Installing the theme.'); $this->strings['installing_package'] = __('Installing the theme&#8230;');
$this->strings['process_failed'] = __('Theme Install Failed.'); $this->strings['process_failed'] = __('Theme install failed.');
$this->strings['process_success'] = __('Theme Installed successfully.'); $this->strings['process_success'] = __('Theme installed successfully.');
} }
function install($package) { function install($package) {
@ -749,8 +749,8 @@ class Core_Upgrader extends WP_Upgrader {
function upgrade_strings() { function upgrade_strings() {
$this->strings['up_to_date'] = __('WordPress is at the latest version.'); $this->strings['up_to_date'] = __('WordPress is at the latest version.');
$this->strings['no_package'] = __('Upgrade package not available.'); $this->strings['no_package'] = __('Upgrade package not available.');
$this->strings['downloading_package'] = __('Downloading update from <span class="code">%s</span>.'); $this->strings['downloading_package'] = __('Downloading update from <span class="code">%s</span>&#8230;');
$this->strings['unpack_package'] = __('Unpacking the update.'); $this->strings['unpack_package'] = __('Unpacking the update&#8230;');
$this->strings['copy_failed'] = __('Could not copy files.'); $this->strings['copy_failed'] = __('Could not copy files.');
} }
@ -913,7 +913,7 @@ class Plugin_Upgrader_Skin extends WP_Upgrader_Skin {
$this->plugin = $this->upgrader->plugin_info(); $this->plugin = $this->upgrader->plugin_info();
if( !empty($this->plugin) && !is_wp_error($this->result) && $this->plugin_active ){ if( !empty($this->plugin) && !is_wp_error($this->result) && $this->plugin_active ){
show_message(__('Attempting reactivation of the plugin')); show_message(__('Reactivating the plugin&#8230;'));
echo '<iframe style="border:0;overflow:hidden" width="100%" height="170px" src="' . wp_nonce_url('update.php?action=activate-plugin&plugin=' . $this->plugin, 'activate-plugin_' . $this->plugin) .'"></iframe>'; echo '<iframe style="border:0;overflow:hidden" width="100%" height="170px" src="' . wp_nonce_url('update.php?action=activate-plugin&plugin=' . $this->plugin, 'activate-plugin_' . $this->plugin) .'"></iframe>';
} }

6
wp-admin/includes/update-core.php
View File

@ -235,14 +235,14 @@ function update_core($from, $to) {
return new WP_Error( 'mysql_not_compatible', sprintf( __('The update cannot be installed because WordPress %1$s requires MySQL version %2$s or higher. You are running version %3$s.'), $wp_version, $required_mysql_version, $mysql_version ) ); return new WP_Error( 'mysql_not_compatible', sprintf( __('The update cannot be installed because WordPress %1$s requires MySQL version %2$s or higher. You are running version %3$s.'), $wp_version, $required_mysql_version, $mysql_version ) );
// Sanity check the unzipped distribution // Sanity check the unzipped distribution
apply_filters('update_feedback', __('Verifying the unpacked files')); apply_filters('update_feedback', __('Verifying the unpacked files&#8230;'));
if ( !$wp_filesystem->exists($from . '/wordpress/wp-settings.php') || !$wp_filesystem->exists($from . '/wordpress/wp-admin/admin.php') || if ( !$wp_filesystem->exists($from . '/wordpress/wp-settings.php') || !$wp_filesystem->exists($from . '/wordpress/wp-admin/admin.php') ||
!$wp_filesystem->exists($from . '/wordpress/wp-includes/functions.php') ) { !$wp_filesystem->exists($from . '/wordpress/wp-includes/functions.php') ) {
$wp_filesystem->delete($from, true); $wp_filesystem->delete($from, true);
return new WP_Error('insane_distro', __('The update could not be unpacked') ); return new WP_Error('insane_distro', __('The update could not be unpacked') );
} }
apply_filters('update_feedback', __('Installing the latest version')); apply_filters('update_feedback', __('Installing the latest version&#8230;'));
// Create maintenance file to signal that we are upgrading // Create maintenance file to signal that we are upgrading
$maintenance_string = '<?php $upgrading = ' . time() . '; ?>'; $maintenance_string = '<?php $upgrading = ' . time() . '; ?>';
@ -267,7 +267,7 @@ function update_core($from, $to) {
} }
// Upgrade DB with separate request // Upgrade DB with separate request
apply_filters('update_feedback', __('Upgrading database')); apply_filters('update_feedback', __('Upgrading database&#8230;'));
$db_upgrade_url = admin_url('upgrade.php?step=upgrade_db'); $db_upgrade_url = admin_url('upgrade.php?step=upgrade_db');
wp_remote_post($db_upgrade_url, array('timeout' => 60)); wp_remote_post($db_upgrade_url, array('timeout' => 60));