Ticket #18200: patch.diff

wp-includes/l10n.php

@@ -540 +540 @@
         }
 
         return $languages;
+}
+
+// retrieves the date/generator/project-id headers from a po file relative to WP_LANG_DIR
+function get_translation_file_data( $file ) {
+        // Just incase someone calls with the machine file instead of the textual version
+        $file = preg_replace( '!\.mo$!i', '.po', $file );
+
+        // Lets just assume that it's within the WP_LANG_DIR for now
+        // if we keep track of the loaded text domains later, we can probably include a lookup for the location of the files instead.
+        $data = get_file_data(  WP_LANG_DIR . '/' . $file,
+                                                        array(
+                                                                'date' => '"PO-Revision-Date',
+                                                                'generator' => '"X-Generator',
+                                                                'project-id' => '"Project-Id-Version'
+                                                                )
+                                                );
+
+        // Strip the .po field endings off the values, which may, or may not, include a textual \n
+        foreach ( (array)$data as $key => $value )
+                $data[$key] = preg_replace( '!(\\\n)?"$!', '', $value);
+
+        return $data;
 }
+ No newline at end of file

wp-admin/includes/update.php

@@ -229 +229 @@
         return $update_themes;
 }
 
+function get_language_updates() {
+
+        //$current = get_site_transient('update_languages');
+        // Uh ...Lets just hard code this for now.
+
+        return array(
+                        (object)array(
+                                                'type' => 'core',
+                                                'lang' => 'de_DE', // The language it is.. This isn't currently used anywhere
+                                                'version' => '2012-02-18 08:48:04', // New Version - Nothing looks at this either.
+                                                'package' => 'http://tools.dd32.id.au/wordpress/core-downloads/core-de_DE.zip'
+                                                ),
+                        (object)array(
+                                                'type' => 'plugin', // The type of the upgrade, 'plugin' or 'theme' will throw files into that folder, any other name (ie. 'core') is thrown into WP_LANG_DIR.. 
+                                                'slug' => 'akismet', // not used.
+                                                'for' => 'akismet/akismet.php', // again, not used yet.
+                                                'lang' => 'de_DE',
+                                                'version' => '2012-02-18 08:48:04',
+                                                'package' => 'http://tools.dd32.id.au/wordpress/core-downloads/akismet-de_DE.zip'
+                                                ),
+                        (object)array(
+                                                'type' => 'theme',
+                                                'slug' => 'twentytwelve',
+                                                'lang' => 'de_DE',
+                                                'version' => '2012-02-18 08:48:04',
+                                                'package' => 'http://tools.dd32.id.au/wordpress/core-downloads/twentytwelve-de_DE.zip' // And no, this isn't a translation of 2012, I believe it's a out of date Core set.
+                                                )
+                );
+}
+
 function wp_update_theme($theme, $feedback = '') {
         if ( !empty($feedback) )
                 add_filter('update_feedback', $feedback);

wp-admin/includes/class-wp-upgrader.php

@@ -165 +165 @@
         function install_package($args = array()) {
                 global $wp_filesystem;
                 $defaults = array( 'source' => '', 'destination' => '', //Please always pass these
-                                                'clear_destination' => false, 'clear_working' => false,
+                                                'clear_destination' => false, 'clear_working' => false, 'abort_if_destination_exists' => true,
                                                 'hook_extra' => array());
 
                 $args = wp_parse_args($args, $defaults);
@@ -224 +224 @@
                                 return $removed;
                         else if ( ! $removed )
                                 return new WP_Error('remove_old_failed', $this->strings['remove_old_failed']);
-                } elseif ( $wp_filesystem->exists($remote_destination) ) {
+                } elseif ( $abort_if_destination_exists && $wp_filesystem->exists($remote_destination) ) {
                         //If we're not clearing the destination folder and something exists there already, Bail.
                         //But first check to see if there are actually any files in the folder.
                         $_files = $wp_filesystem->dirlist($remote_destination);
@@ -272 +272 @@
                 $defaults = array(      'package' => '', //Please always pass this.
                                                         'destination' => '', //And this
                                                         'clear_destination' => false,
+                                                        'abort_if_destination_exists' => true, // Abort if the Destination directory exists, Pass clear_destination as false please
                                                         'clear_working' => true,
                                                         'is_multi' => false,
                                                         'hook_extra' => array() //Pass any extra $hook_extra args here, this will be passed to any hooked filters.
@@ -318 +319 @@
                                                                                         'source' => $working_dir,
                                                                                         'destination' => $destination,
                                                                                         'clear_destination' => $clear_destination,
+                                                                                        'abort_if_destination_exists' => $abort_if_destination_exists,
                                                                                         'clear_working' => $clear_working,
                                                                                         'hook_extra' => $hook_extra
                                                                                 ) );
@@ -410 +412 @@
                 if ( ! $this->result || is_wp_error($this->result) )
                         return $this->result;
 
+                do_action( 'upgrader_process_complete', $this, 'install-plugin', $package );
+
                 // Force refresh of plugin update information
                 delete_site_transient('update_plugins');
 
@@ -454 +458 @@
                 if ( ! $this->result || is_wp_error($this->result) )
                         return $this->result;
 
+                do_action( 'upgrader_process_complete', $this, 'update-plugin', $plugin );
+
                 // Force refresh of plugin update information
                 delete_site_transient('update_plugins');
         }
@@ -535 +541 @@
                 // Cleanup our hooks, in case something else does a upgrade on this connection.
                 remove_filter('upgrader_clear_destination', array(&$this, 'delete_old_plugin'));
 
+                do_action( 'upgrader_process_complete', $this, 'bulk-upgrade-plugins', $plugins );
+
                 // Force refresh of plugin update information
                 delete_site_transient('update_plugins');
 
@@ -685 +693 @@
                 if ( ! $this->result || is_wp_error($this->result) )
                         return $this->result;
 
+                do_action( 'upgrader_process_complete', $this, 'install-theme', $package );
+
                 // Force refresh of theme update information
                 delete_site_transient('update_themes');
 
@@ -731 +741 @@
                 if ( ! $this->result || is_wp_error($this->result) )
                         return $this->result;
 
+                do_action( 'upgrader_process_complete', $this, 'upgrade-theme', $theme );
+
                 // Force refresh of theme update information
                 delete_site_transient('update_themes');
 
@@ -818 +830 @@
                 remove_filter('upgrader_post_install', array(&$this, 'current_after'), 10, 2);
                 remove_filter('upgrader_clear_destination', array(&$this, 'delete_old_theme'), 10, 4);
 
+                do_action( 'upgrader_process_complete', $this, 'bulk-upgrade-themes', $themes );
+
                 // Force refresh of theme update information
                 delete_site_transient('update_themes');
 
@@ -985 +999 @@
 
                 require(ABSPATH . 'wp-admin/includes/update-core.php');
 
+                //  @TODO: Add the upgrader_process_complete bizzo here somewhere
                 return update_core($working_dir, $wp_dir);
         }
 
 }
 
+add_action( 'upgrader_process_complete', 'Language_Pack_Upgrader::async_upgrade', 10, 3);
+class Language_Pack_Upgrader extends WP_Upgrader {
+        
+        var $result;
+        var $bulk = true;
+
+        static function async_upgrade( $upgrader, $context, $package ) {
+                // Don't do Language updates on language updates on language updates..
+                if ( $upgrader instanceof Language_Pack_Upgrader )
+                        return;
+
+                echo '<!-- start languages --><div style="padding-left: 3em; border-left: 5px solid grey">';
+
+                $lp_upgrader = new Language_Pack_Upgrader( new Headerless_Skin() );
+
+                $lp_upgrader->upgrade();
+
+                echo '</div><!-- end of languages -->';
+        }
+        function upgrade_strings() {
+                $this->strings['stating_upgrade'] = __( 'Some of your language files need updating, Sit tight for a few more seconds while we update them as well.' );
+                $this->strings['up_to_date'] = __('The language is up to date.'); // We need to silently skip this case
+                $this->strings['no_package'] = __('Update package not available.');
+                $this->strings['downloading_package'] = __('Downloading language 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 language&#8230;');
+                $this->strings['remove_old_failed'] = __('Could not remove the old language.');
+                $this->strings['process_failed'] = __('Language update failed.');
+                $this->strings['process_success'] = __('Language updated successfully.');
+        }
+
+        function upgrade() {
+                return $this->bulk_upgrade();
+        }
+
+        function bulk_upgrade() {
+
+                $this->init();
+                $this->upgrade_strings();
+
+                $language_updates = get_language_updates();
+
+                if ( empty($language_updates) )
+                        return true;
+                
+                $this->skin->feedback( 'starting_upgrade' );
+
+                add_filter('upgrader_source_selection', array(&$this, 'check_package'), 10, 3 );
+
+                $this->skin->header();
+
+                // Connect to the Filesystem first.
+                $res = $this->fs_connect( array(WP_CONTENT_DIR, WP_LANG_DIR) );
+                if ( ! $res ) {
+                        $this->skin->footer();
+                        return false;
+                }
+
+                $results = array();
+
+                $this->update_count = count($language_updates);
+                $this->update_current = 0;
+                foreach ( $language_updates as $language_update ) {
+
+                        $destination = WP_LANG_DIR;
+                        if ( 'plugin' == $language_update->type ) {
+                                $destination .= '/plugins';
+                        } elseif ( 'theme' == $language_update->type ) {
+                                $destination .= '/themes';
+                        }
+
+                        $this->update_current++;
+
+                        $options = array(
+                                                        'package' => $language_update->package,
+                                                        'destination' => $destination,
+                                                        'clear_destination' => false,
+                                                        'abort_if_destination_exists' => false, // We expect the destination to exist.
+                                                        'clear_working' => true,
+                                                        'is_multi' => true,
+                                                        'hook_extra' => array(
+                                                                                                'language_update_type' => $language_update->type,
+                                                                                                'language_update' => $language_update,
+                                                                                                )
+                                                        );
+
+                        $result = $this->run($options);
+
+                        $results[] = $this->result;
+
+                        // Prevent credentials auth screen from displaying multiple times
+                        if ( false === $result )
+                                break;
+                } //end foreach $language_updates
+
+                // Cleanup our hooks, in case something else does a upgrade on this connection.
+                remove_filter('upgrader_source_selection', array(&$this, 'check_package'), 10, 2 );
+
+                // Force refresh of language update information
+                delete_site_transient('update_languages');
+
+                return $results;
+        }
+
+        function check_package( $source, $remote_source ) {
+                global $wp_filesystem;
+
+                if ( is_wp_error($source) )
+                        return $source;
+
+                // Check the folder contains a valid language
+                $files = $wp_filesystem->dirlist( $remote_source );
+
+                // Check to see if a .po and .mo exist in the folder.. check they're named right? 
+                $po = $mo = false;
+                foreach ( (array)$files as $file => $filedata ) {
+                        if ( '.po' == substr( $file, -3) )
+                                $po = true;
+                        elseif ( '.mo' == substr($file, -3) )
+                                $mo = true;
+                }
+
+                if ( ! $mo || ! $po )
+                        return new WP_Error( 'incompatible_archive', $this->strings['incompatible_archive'], __( 'The language pack is missing either the <code>.po</code> or <code>.mo</code> files.' ) );
+
+                return $source;
+        }
+
+}
+
 /**
  * Generic Skin for the WordPress Upgrader classes. This skin is designed to be extended for specific purposes.
  *
@@ -1078 +1223 @@
 }
 
 /**
+ * A basic Upgrader skin which doesn't have any Header/Footers
+ *
+ * @package WordPress
+ * @subpackage Upgrader
+ * @since 3.4.0
+ */
+class Headerless_Skin extends WP_Upgrader_Skin {
+        function before() {}
+        function after() {}
+        function header() {}
+        function footer() {}
+}
+
+/**
  * Plugin Upgrader Skin for WordPress Plugin Upgrades.
  *
  * @TODO More Detailed docs, for methods as well.