WordPress.org

Make WordPress Core

Changeset 12533


Ignore:
Timestamp:
12/24/2009 09:46:57 AM (10 years ago)
Author:
westi
Message:

Consitent use of … Fixes #10374 props demetris.

Location:
trunk/wp-admin
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/import/livejournal.php

    r12270 r12533  
    843843
    844844        echo '<div id="ljapi-status">';
    845         echo '<h3>' . __( 'Downloading Comments' ) . '</h3>';
     845        echo '<h3>' . __( 'Downloading Comments&#8230;' ) . '</h3>';
    846846        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>';
    847847        ob_flush(); flush();
     
    891891
    892892        echo '<div id="ljapi-status">';
    893         echo '<h3>' . __( 'Threading Comments' ) . '</h3>';
     893        echo '<h3>' . __( 'Threading Comments&#8230;' ) . '</h3>';
    894894        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>';
    895895        ob_flush(); flush();
     
    964964
    965965            function ljapi_msg() {
    966                 str = '<?php _e( "Continuing in %d" ) ?>';
     966                str = '<?php _e( "Continuing in %d&#8230;" ) ?>';
    967967                jQuery( '#<?php echo $msg ?>' ).text( str.replace( /%d/, next_counter ) );
    968968                if ( next_counter <= 0 ) {
    969969                    if ( jQuery( '#<?php echo $id ?>' ).length ) {
    970970                        jQuery( "#<?php echo $id ?> input[type='submit']" ).hide();
    971                         str = '<?php _e( "Continuing" ) ?> <img src="images/wpspin_light.gif" alt="" id="processing" align="top" />';
     971                        str = '<?php _e( "Continuing&#8230;" ) ?> <img src="images/wpspin_light.gif" alt="" id="processing" align="top" />';
    972972                        jQuery( '#<?php echo $msg ?>' ).html( str );
    973973                        jQuery( '#<?php echo $id ?>' ).submit();
     
    992992
    993993            function ljapi_msg() {
    994                 str = '<?php _e( "Continuing in %d" ) ?>';
     994                str = '<?php _e( "Continuing in %d&#8230;" ) ?>';
    995995                jQuery( '#<?php echo $msg ?>' ).text( str.replace( /%d/, next_counter ) );
    996996                if ( next_counter <= 0 ) {
  • trunk/wp-admin/includes/class-wp-upgrader.php

    r12227 r12533  
    5252
    5353        $this->strings['download_failed'] = __('Download failed.');
    54         $this->strings['installing_package'] = __('Installing the latest version.');
     54        $this->strings['installing_package'] = __('Installing the latest version&#8230;');
    5555        $this->strings['folder_exists'] = __('Destination folder already exists.');
    5656        $this->strings['mkdir_failed'] = __('Could not create directory.');
    5757        $this->strings['bad_package'] = __('Incompatible Archive');
    5858
    59         $this->strings['maintenance_start'] = __('Enabling Maintenance mode.');
    60         $this->strings['maintenance_end'] = __('Disabling Maintenance mode.');
     59        $this->strings['maintenance_start'] = __('Enabling Maintenance mode&#8230;');
     60        $this->strings['maintenance_end'] = __('Disabling Maintenance mode&#8230;');
    6161    }
    6262
     
    367367        $this->strings['up_to_date'] = __('The plugin is at the latest version.');
    368368        $this->strings['no_package'] = __('Upgrade package not available.');
    369         $this->strings['downloading_package'] = __('Downloading update from <span class="code">%s</span>.');
    370         $this->strings['unpack_package'] = __('Unpacking the update.');
    371         $this->strings['deactivate_plugin'] = __('Deactivating the plugin.');
    372         $this->strings['remove_old'] = __('Removing the old version of the plugin.');
     369        $this->strings['downloading_package'] = __('Downloading update from <span class="code">%s</span>&#8230;');
     370        $this->strings['unpack_package'] = __('Unpacking the update&#8230;');
     371        $this->strings['deactivate_plugin'] = __('Deactivating the plugin&#8230;');
     372        $this->strings['remove_old'] = __('Removing the old version of the plugin&#8230;');
    373373        $this->strings['remove_old_failed'] = __('Could not remove the old plugin.');
    374         $this->strings['process_failed'] = __('Plugin upgrade Failed.');
     374        $this->strings['process_failed'] = __('Plugin upgrade failed.');
    375375        $this->strings['process_success'] = __('Plugin upgraded successfully.');
    376376    }
     
    378378    function install_strings() {
    379379        $this->strings['no_package'] = __('Install package not available.');
    380         $this->strings['downloading_package'] = __('Downloading install package from <span class="code">%s</span>.');
    381         $this->strings['unpack_package'] = __('Unpacking the package.');
    382         $this->strings['installing_package'] = __('Installing the plugin.');
    383         $this->strings['process_failed'] = __('Plugin Install Failed.');
    384         $this->strings['process_success'] = __('Plugin Installed successfully.');
     380        $this->strings['downloading_package'] = __('Downloading install package from <span class="code">%s</span>&#8230;');
     381        $this->strings['unpack_package'] = __('Unpacking the package&#8230;');
     382        $this->strings['installing_package'] = __('Installing the plugin&#8230;');
     383        $this->strings['process_failed'] = __('Plugin install failed.');
     384        $this->strings['process_success'] = __('Plugin installed successfully.');
    385385    }
    386386
     
    593593        $this->strings['up_to_date'] = __('The theme is at the latest version.');
    594594        $this->strings['no_package'] = __('Upgrade package not available.');
    595         $this->strings['downloading_package'] = __('Downloading update from <span class="code">%s</span>.');
    596         $this->strings['unpack_package'] = __('Unpacking the update.');
    597         $this->strings['remove_old'] = __('Removing the old version of the theme.');
     595        $this->strings['downloading_package'] = __('Downloading update from <span class="code">%s</span>&#8230;');
     596        $this->strings['unpack_package'] = __('Unpacking the update&#8230;');
     597        $this->strings['remove_old'] = __('Removing the old version of the theme&#8230;');
    598598        $this->strings['remove_old_failed'] = __('Could not remove the old theme.');
    599         $this->strings['process_failed'] = __('Theme upgrade Failed.');
     599        $this->strings['process_failed'] = __('Theme upgrade failed.');
    600600        $this->strings['process_success'] = __('Theme upgraded successfully.');
    601601    }
     
    603603    function install_strings() {
    604604        $this->strings['no_package'] = __('Install package not available.');
    605         $this->strings['downloading_package'] = __('Downloading install package from <span class="code">%s</span>.');
    606         $this->strings['unpack_package'] = __('Unpacking the package.');
    607         $this->strings['installing_package'] = __('Installing the theme.');
    608         $this->strings['process_failed'] = __('Theme Install Failed.');
    609         $this->strings['process_success'] = __('Theme Installed successfully.');
     605        $this->strings['downloading_package'] = __('Downloading install package from <span class="code">%s</span>&#8230;');
     606        $this->strings['unpack_package'] = __('Unpacking the package&#8230;');
     607        $this->strings['installing_package'] = __('Installing the theme&#8230;');
     608        $this->strings['process_failed'] = __('Theme install failed.');
     609        $this->strings['process_success'] = __('Theme installed successfully.');
    610610    }
    611611
     
    750750        $this->strings['up_to_date'] = __('WordPress is at the latest version.');
    751751        $this->strings['no_package'] = __('Upgrade package not available.');
    752         $this->strings['downloading_package'] = __('Downloading update from <span class="code">%s</span>.');
    753         $this->strings['unpack_package'] = __('Unpacking the update.');
     752        $this->strings['downloading_package'] = __('Downloading update from <span class="code">%s</span>&#8230;');
     753        $this->strings['unpack_package'] = __('Unpacking the update&#8230;');
    754754        $this->strings['copy_failed'] = __('Could not copy files.');
    755755    }
     
    914914        $this->plugin = $this->upgrader->plugin_info();
    915915        if( !empty($this->plugin) && !is_wp_error($this->result) && $this->plugin_active ){
    916             show_message(__('Attempting reactivation of the plugin'));
     916            show_message(__('Reactivating the plugin&#8230;'));
    917917            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>';
    918918        }
  • trunk/wp-admin/includes/update-core.php

    r12450 r12533  
    236236
    237237    // Sanity check the unzipped distribution
    238     apply_filters('update_feedback', __('Verifying the unpacked files'));
     238    apply_filters('update_feedback', __('Verifying the unpacked files&#8230;'));
    239239    if ( !$wp_filesystem->exists($from . '/wordpress/wp-settings.php') || !$wp_filesystem->exists($from . '/wordpress/wp-admin/admin.php') ||
    240240        !$wp_filesystem->exists($from . '/wordpress/wp-includes/functions.php') ) {
     
    243243    }
    244244
    245     apply_filters('update_feedback', __('Installing the latest version'));
     245    apply_filters('update_feedback', __('Installing the latest version&#8230;'));
    246246
    247247    // Create maintenance file to signal that we are upgrading
     
    268268
    269269    // Upgrade DB with separate request
    270     apply_filters('update_feedback', __('Upgrading database'));
     270    apply_filters('update_feedback', __('Upgrading database&#8230;'));
    271271    $db_upgrade_url = admin_url('upgrade.php?step=upgrade_db');
    272272    wp_remote_post($db_upgrade_url, array('timeout' => 60));
Note: See TracChangeset for help on using the changeset viewer.