<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[12533] trunk/wp-admin: Consitent use of ?\226?\128?
\166 Fixes #10374 props demetris.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12533">12533</a></dd>
<dt>Author</dt> <dd>westi</dd>
<dt>Date</dt> <dd>2009-12-24 09:46:57 +0000 (Thu, 24 Dec 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Consitent use of ?\226?\128?\166 Fixes <a href="http://trac.wordpress.org/ticket/10374">#10374</a> props demetris.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminimportlivejournalphp">trunk/wp-admin/import/livejournal.php</a></li>
<li><a href="#trunkwpadminincludesclasswpupgraderphp">trunk/wp-admin/includes/class-wp-upgrader.php</a></li>
<li><a href="#trunkwpadminincludesupdatecorephp">trunk/wp-admin/includes/update-core.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminimportlivejournalphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/import/livejournal.php (12532 => 12533)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/import/livejournal.php 2009-12-24 09:30:12 UTC (rev 12532)
+++ trunk/wp-admin/import/livejournal.php 2009-12-24 09:46:57 UTC (rev 12533)
</span><span class="lines">@@ -842,7 +842,7 @@
</span><span class="cx"> $this->ixr = new IXR_Client( $this->ixr_url, false, 80, 30 );
</span><span class="cx">
</span><span class="cx"> echo '<div id="ljapi-status">';
</span><del>- echo '<h3>' . __( 'Downloading Comments' ) . '</h3>';
</del><ins>+ echo '<h3>' . __( 'Downloading Comments&#8230;' ) . '</h3>';
</ins><span class="cx"> 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>';
</span><span class="cx"> ob_flush(); flush();
</span><span class="cx">
</span><span class="lines">@@ -890,7 +890,7 @@
</span><span class="cx"> update_option( 'ljapi_step', 3 );
</span><span class="cx">
</span><span class="cx"> echo '<div id="ljapi-status">';
</span><del>- echo '<h3>' . __( 'Threading Comments' ) . '</h3>';
</del><ins>+ echo '<h3>' . __( 'Threading Comments&#8230;' ) . '</h3>';
</ins><span class="cx"> 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>';
</span><span class="cx"> ob_flush(); flush();
</span><span class="cx">
</span><span class="lines">@@ -963,12 +963,12 @@
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> function ljapi_msg() {
</span><del>- str = '<?php _e( "Continuing in %d" ) ?>';
</del><ins>+ str = '<?php _e( "Continuing in %d&#8230;" ) ?>';
</ins><span class="cx"> jQuery( '#<?php echo $msg ?>' ).text( str.replace( /%d/, next_counter ) );
</span><span class="cx"> if ( next_counter <= 0 ) {
</span><span class="cx"> if ( jQuery( '#<?php echo $id ?>' ).length ) {
</span><span class="cx"> jQuery( "#<?php echo $id ?> input[type='submit']" ).hide();
</span><del>- str = '<?php _e( "Continuing" ) ?> <img src="images/wpspin_light.gif" alt="" id="processing" align="top" />';
</del><ins>+ str = '<?php _e( "Continuing&#8230;" ) ?> <img src="images/wpspin_light.gif" alt="" id="processing" align="top" />';
</ins><span class="cx"> jQuery( '#<?php echo $msg ?>' ).html( str );
</span><span class="cx"> jQuery( '#<?php echo $id ?>' ).submit();
</span><span class="cx"> return;
</span><span class="lines">@@ -991,7 +991,7 @@
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> function ljapi_msg() {
</span><del>- str = '<?php _e( "Continuing in %d" ) ?>';
</del><ins>+ str = '<?php _e( "Continuing in %d&#8230;" ) ?>';
</ins><span class="cx"> jQuery( '#<?php echo $msg ?>' ).text( str.replace( /%d/, next_counter ) );
</span><span class="cx"> if ( next_counter <= 0 ) {
</span><span class="cx"> if ( jQuery( '#<?php echo $id ?>' ).length ) {
</span></span></pre></div>
<a id="trunkwpadminincludesclasswpupgraderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-upgrader.php (12532 => 12533)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-upgrader.php 2009-12-24 09:30:12 UTC (rev 12532)
+++ trunk/wp-admin/includes/class-wp-upgrader.php 2009-12-24 09:46:57 UTC (rev 12533)
</span><span class="lines">@@ -51,13 +51,13 @@
</span><span class="cx"> $this->strings['fs_no_folder'] = __('Unable to locate needed folder (%s).');
</span><span class="cx">
</span><span class="cx"> $this->strings['download_failed'] = __('Download failed.');
</span><del>- $this->strings['installing_package'] = __('Installing the latest version.');
</del><ins>+ $this->strings['installing_package'] = __('Installing the latest version&#8230;');
</ins><span class="cx"> $this->strings['folder_exists'] = __('Destination folder already exists.');
</span><span class="cx"> $this->strings['mkdir_failed'] = __('Could not create directory.');
</span><span class="cx"> $this->strings['bad_package'] = __('Incompatible Archive');
</span><span class="cx">
</span><del>- $this->strings['maintenance_start'] = __('Enabling Maintenance mode.');
- $this->strings['maintenance_end'] = __('Disabling Maintenance mode.');
</del><ins>+ $this->strings['maintenance_start'] = __('Enabling Maintenance mode&#8230;');
+ $this->strings['maintenance_end'] = __('Disabling Maintenance mode&#8230;');
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function fs_connect( $directories = array() ) {
</span><span class="lines">@@ -366,22 +366,22 @@
</span><span class="cx"> function upgrade_strings() {
</span><span class="cx"> $this->strings['up_to_date'] = __('The plugin is at the latest version.');
</span><span class="cx"> $this->strings['no_package'] = __('Upgrade package not available.');
</span><del>- $this->strings['downloading_package'] = __('Downloading update from <span class="code">%s</span>.');
- $this->strings['unpack_package'] = __('Unpacking the update.');
- $this->strings['deactivate_plugin'] = __('Deactivating the plugin.');
- $this->strings['remove_old'] = __('Removing the old version of the plugin.');
</del><ins>+ $this->strings['downloading_package'] = __('Downloading update from <span class="code">%s</span>&#8230;');
+ $this->strings['unpack_package'] = __('Unpacking the update&#8230;');
+ $this->strings['deactivate_plugin'] = __('Deactivating the plugin&#8230;');
+ $this->strings['remove_old'] = __('Removing the old version of the plugin&#8230;');
</ins><span class="cx"> $this->strings['remove_old_failed'] = __('Could not remove the old plugin.');
</span><del>- $this->strings['process_failed'] = __('Plugin upgrade Failed.');
</del><ins>+ $this->strings['process_failed'] = __('Plugin upgrade failed.');
</ins><span class="cx"> $this->strings['process_success'] = __('Plugin upgraded successfully.');
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function install_strings() {
</span><span class="cx"> $this->strings['no_package'] = __('Install package not available.');
</span><del>- $this->strings['downloading_package'] = __('Downloading install package from <span class="code">%s</span>.');
- $this->strings['unpack_package'] = __('Unpacking the package.');
- $this->strings['installing_package'] = __('Installing the plugin.');
- $this->strings['process_failed'] = __('Plugin Install Failed.');
- $this->strings['process_success'] = __('Plugin Installed successfully.');
</del><ins>+ $this->strings['downloading_package'] = __('Downloading install package from <span class="code">%s</span>&#8230;');
+ $this->strings['unpack_package'] = __('Unpacking the package&#8230;');
+ $this->strings['installing_package'] = __('Installing the plugin&#8230;');
+ $this->strings['process_failed'] = __('Plugin install failed.');
+ $this->strings['process_success'] = __('Plugin installed successfully.');
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function install($package) {
</span><span class="lines">@@ -592,21 +592,21 @@
</span><span class="cx"> function upgrade_strings() {
</span><span class="cx"> $this->strings['up_to_date'] = __('The theme is at the latest version.');
</span><span class="cx"> $this->strings['no_package'] = __('Upgrade package not available.');
</span><del>- $this->strings['downloading_package'] = __('Downloading update from <span class="code">%s</span>.');
- $this->strings['unpack_package'] = __('Unpacking the update.');
- $this->strings['remove_old'] = __('Removing the old version of the theme.');
</del><ins>+ $this->strings['downloading_package'] = __('Downloading update from <span class="code">%s</span>&#8230;');
+ $this->strings['unpack_package'] = __('Unpacking the update&#8230;');
+ $this->strings['remove_old'] = __('Removing the old version of the theme&#8230;');
</ins><span class="cx"> $this->strings['remove_old_failed'] = __('Could not remove the old theme.');
</span><del>- $this->strings['process_failed'] = __('Theme upgrade Failed.');
</del><ins>+ $this->strings['process_failed'] = __('Theme upgrade failed.');
</ins><span class="cx"> $this->strings['process_success'] = __('Theme upgraded successfully.');
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function install_strings() {
</span><span class="cx"> $this->strings['no_package'] = __('Install package not available.');
</span><del>- $this->strings['downloading_package'] = __('Downloading install package from <span class="code">%s</span>.');
- $this->strings['unpack_package'] = __('Unpacking the package.');
- $this->strings['installing_package'] = __('Installing the theme.');
- $this->strings['process_failed'] = __('Theme Install Failed.');
- $this->strings['process_success'] = __('Theme Installed successfully.');
</del><ins>+ $this->strings['downloading_package'] = __('Downloading install package from <span class="code">%s</span>&#8230;');
+ $this->strings['unpack_package'] = __('Unpacking the package&#8230;');
+ $this->strings['installing_package'] = __('Installing the theme&#8230;');
+ $this->strings['process_failed'] = __('Theme install failed.');
+ $this->strings['process_success'] = __('Theme installed successfully.');
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function install($package) {
</span><span class="lines">@@ -749,8 +749,8 @@
</span><span class="cx"> function upgrade_strings() {
</span><span class="cx"> $this->strings['up_to_date'] = __('WordPress is at the latest version.');
</span><span class="cx"> $this->strings['no_package'] = __('Upgrade package not available.');
</span><del>- $this->strings['downloading_package'] = __('Downloading update from <span class="code">%s</span>.');
- $this->strings['unpack_package'] = __('Unpacking the update.');
</del><ins>+ $this->strings['downloading_package'] = __('Downloading update from <span class="code">%s</span>&#8230;');
+ $this->strings['unpack_package'] = __('Unpacking the update&#8230;');
</ins><span class="cx"> $this->strings['copy_failed'] = __('Could not copy files.');
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -913,7 +913,7 @@
</span><span class="cx">
</span><span class="cx"> $this->plugin = $this->upgrader->plugin_info();
</span><span class="cx"> if( !empty($this->plugin) && !is_wp_error($this->result) && $this->plugin_active ){
</span><del>- show_message(__('Attempting reactivation of the plugin'));
</del><ins>+ show_message(__('Reactivating the plugin&#8230;'));
</ins><span class="cx"> 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>';
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminincludesupdatecorephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/update-core.php (12532 => 12533)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/update-core.php 2009-12-24 09:30:12 UTC (rev 12532)
+++ trunk/wp-admin/includes/update-core.php 2009-12-24 09:46:57 UTC (rev 12533)
</span><span class="lines">@@ -235,14 +235,14 @@
</span><span class="cx"> 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 ) );
</span><span class="cx">
</span><span class="cx"> // Sanity check the unzipped distribution
</span><del>- apply_filters('update_feedback', __('Verifying the unpacked files'));
</del><ins>+ apply_filters('update_feedback', __('Verifying the unpacked files&#8230;'));
</ins><span class="cx"> if ( !$wp_filesystem->exists($from . '/wordpress/wp-settings.php') || !$wp_filesystem->exists($from . '/wordpress/wp-admin/admin.php') ||
</span><span class="cx"> !$wp_filesystem->exists($from . '/wordpress/wp-includes/functions.php') ) {
</span><span class="cx"> $wp_filesystem->delete($from, true);
</span><span class="cx"> return new WP_Error('insane_distro', __('The update could not be unpacked') );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- apply_filters('update_feedback', __('Installing the latest version'));
</del><ins>+ apply_filters('update_feedback', __('Installing the latest version&#8230;'));
</ins><span class="cx">
</span><span class="cx"> // Create maintenance file to signal that we are upgrading
</span><span class="cx"> $maintenance_string = '<?php $upgrading = ' . time() . '; ?>';
</span><span class="lines">@@ -267,7 +267,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Upgrade DB with separate request
</span><del>- apply_filters('update_feedback', __('Upgrading database'));
</del><ins>+ apply_filters('update_feedback', __('Upgrading database&#8230;'));
</ins><span class="cx"> $db_upgrade_url = admin_url('upgrade.php?step=upgrade_db');
</span><span class="cx"> wp_remote_post($db_upgrade_url, array('timeout' => 60));
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>