Ticket #35191: 35191.13.diff
| File 35191.13.diff, 19.8 KB (added by , 8 years ago) |
|---|
-
src/wp-admin/css/common.css
2277 2277 2278 2278 .importers td { 2279 2279 padding-right: 14px; 2280 line-height: 1.5em; 2280 2281 } 2281 2282 2282 2283 .importers { … … 2284 2285 width: auto; 2285 2286 } 2286 2287 2288 .importer-title, 2289 .importer-desc, 2290 .importer-action { 2291 display: block; 2292 } 2293 2294 .importer-title { 2295 color: #000; 2296 font-size: 14px; 2297 font-weight: 400; 2298 margin-bottom: .2em; 2299 } 2300 2301 .importer-action { 2302 margin-bottom: 1em; 2303 color: #ddd; 2304 } 2305 2287 2306 #post-body #post-body-content #namediv h3, /* Back-compat for pre-4.4 */ 2288 2307 #post-body #post-body-content #namediv h2 { 2289 2308 margin-top: 0; -
src/wp-admin/import.php
30 30 '<p>' . __('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>' 31 31 ); 32 32 33 if ( current_user_can( 'install_plugins' ) ) 33 if ( current_user_can( 'install_plugins' ) ) { 34 // List of popular importer plugins from the WordPress.org API. 34 35 $popular_importers = wp_get_popular_importers(); 35 else 36 $popular_importers = array(); 36 } else { 37 $popular_importers = array(); 38 } 37 39 38 40 // Detect and redirect invalid importers like 'movabletype', which is registered as 'mt' 39 41 if ( ! empty( $_GET['invalid'] ) && isset( $popular_importers[ $_GET['invalid'] ] ) ) { … … 66 68 <p><?php _e('If you have posts or comments in another system, WordPress can import those into this site. To get started, choose a system to import from below:'); ?></p> 67 69 68 70 <?php 69 71 // Registered (already installed) importers. They're stored in the global $wp_importers. 70 72 $importers = get_importers(); 71 73 72 74 // If a popular importer is not registered, create a dummy registration that links to the plugin installer. … … 75 77 continue; 76 78 if ( isset( $importers[ $pop_data['importer-id'] ] ) ) 77 79 continue; 80 81 // Fill the array of registered (already installed) importers with data of the popular importers from the WordPress.org API. 78 82 $importers[ $pop_data['importer-id'] ] = array( $pop_data['name'], $pop_data['description'], 'install' => $pop_data['plugin-slug'] ); 79 83 } 80 84 … … 87 91 88 92 <?php 89 93 foreach ($importers as $importer_id => $data) { 90 $action = ''; 94 $plugin_slug = $action = ''; 95 $plugin_installed = false; 96 91 97 if ( isset( $data['install'] ) ) { 92 98 $plugin_slug = $data['install']; 99 93 100 if ( file_exists( WP_PLUGIN_DIR . '/' . $plugin_slug ) ) { 94 // Looks like Importer is installed, But not active101 // Looks like an importer is installed, but not active. 95 102 $plugins = get_plugins( '/' . $plugin_slug ); 96 if ( ! empty($plugins) ) {97 $keys = array_keys( $plugins);103 if ( ! empty( $plugins ) ) { 104 $keys = array_keys( $plugins ); 98 105 $plugin_file = $plugin_slug . '/' . $keys[0]; 99 $action = '<a href="' . esc_url(wp_nonce_url(admin_url('plugins.php?action=activate&plugin=' . $plugin_file . '&from=import'), 'activate-plugin_' . $plugin_file)) . 100 '"title="' . esc_attr__('Activate importer') . '"">' . $data[0] . '</a>'; 106 $url = wp_nonce_url( add_query_arg( array( 107 'action' => 'activate', 108 'plugin' => $plugin_file, 109 'from' => 'import', 110 ), admin_url( 'plugins.php' ) ), 'activate-plugin_' . $plugin_file ); 111 $action = sprintf( 112 '<a href="%s" aria-label="%s">%s</a>', 113 esc_url( $url ), 114 /* translators: %s: name of importer */ 115 esc_attr( sprintf( __( 'Run “%s”' ), $data[0] ) ), 116 __( 'Run Importer' ) 117 ); 118 119 $plugin_installed = true; 101 120 } 102 121 } 103 if ( empty($action) ) { 122 123 if ( empty( $action ) ) { 104 124 if ( is_main_site() ) { 105 $action = '<a href="' . esc_url( network_admin_url( 'plugin-install.php?tab=plugin-information&plugin=' . $plugin_slug . 106 '&from=import&TB_iframe=true&width=600&height=550' ) ) . '" class="thickbox open-plugin-details-modal" title="' . 107 esc_attr__('Install importer') . '">' . $data[0] . '</a>'; 125 $url = wp_nonce_url( add_query_arg( array( 126 'action' => 'install-plugin', 127 'plugin' => $plugin_slug, 128 'from' => 'import', 129 ), self_admin_url( 'update.php' ) ), 'install-plugin_' . $plugin_slug ); 130 $action = sprintf( 131 '<a href="%1$s" class="install-now" data-slug="%2$s" data-name="%3$s" aria-label="%4$s">%5$s</a>', 132 esc_url( $url ), 133 esc_attr( $plugin_slug ), 134 esc_attr( $data[0] ), 135 /* translators: name of importer */ 136 esc_attr( sprintf( __( 'Install “%s”' ), $data[0] ) ), 137 __( 'Install Now' ) 138 ); 108 139 } else { 109 $action = $data[0]; 110 $data[1] = sprintf( __( 'This importer is not installed. Please install importers from <a href="%s">the main site</a>.' ), get_admin_url( $current_site->blog_id, 'import.php' ) ); 140 $action = sprintf( 141 __( 'This importer is not installed. Please install importers from <a href="%s">the main site</a>.' ), 142 get_admin_url( get_current_network_id(), 'import.php' ) 143 ); 111 144 } 112 145 } 113 146 } else { 114 $action = "<a href='" . esc_url( "admin.php?import=$importer_id" ) . "' title='" . esc_attr( wptexturize( strip_tags( $data[1] ) ) ) ."'>{$data[0]}</a>"; 147 $plugin_installed = true; 148 $url = add_query_arg( array( 149 'import' => $importer_id, 150 ), self_admin_url( 'admin.php' ) ); 151 $action = sprintf( 152 '<a href="%1$s" aria-label="%2$s">%3$s</a>', 153 esc_url( $url ), 154 /* translators: %s: name of importer */ 155 esc_attr( sprintf( __( 'Run “%s”' ), $data[0] ) ), 156 __( 'Run Importer' ) 157 ); 115 158 } 116 159 160 if ( ! $plugin_installed ) { 161 $url = add_query_arg( array( 162 'tab' => 'plugin-information', 163 'plugin' => $plugin_slug, 164 'from' => 'import', 165 'TB_iframe' => 'true', 166 'width' => 600, 167 'height' => 550, 168 ), network_admin_url( 'plugin-install.php' ) ); 169 $action .= sprintf( 170 ' | <a href="%1$s" class="thickbox open-plugin-details-modal" aria-label="%2$s">%3$s</a>', 171 esc_url( $url ), 172 /* translators: %s: name of importer */ 173 esc_attr( sprintf( __( 'More information about “%s”' ), $data[0] ) ), 174 __( 'Details' ) 175 ); 176 } 177 117 178 echo " 118 <tr> 119 <td class='import-system row-title'>$action</td> 120 <td class='desc'>{$data[1]}</td> 179 <tr class='importer-item'> 180 <td class='import-system'> 181 <span class='importer-title'>{$data[0]}</span> 182 <span class='importer-action'>{$action}</span> 183 </td> 184 <td class='desc'> 185 <span class='importer-desc'>{$data[1]}</span> 186 </td> 121 187 </tr>"; 122 188 } 123 189 ?> -
src/wp-admin/includes/import.php
126 126 include( ABSPATH . WPINC . '/version.php' ); // include an unmodified $wp_version 127 127 128 128 $locale = get_locale(); 129 $popular_importers = get_site_transient( 'popular_importers_' . $locale ); 129 $cache_key = 'popular_importers_' . md5( $locale . $wp_version ); 130 $popular_importers = get_site_transient( $cache_key ); 130 131 131 132 if ( ! $popular_importers ) { 132 $url = add_query_arg( 'locale', get_locale(), 'http://api.wordpress.org/core/importers/1.1/' ); 133 $url = add_query_arg( array( 134 'locale' => get_locale(), 135 'version' => $wp_version, 136 ), 'http://api.wordpress.org/core/importers/1.1/' ); 133 137 $options = array( 'user-agent' => 'WordPress/' . $wp_version . '; ' . home_url() ); 134 138 $response = wp_remote_get( $url, $options ); 135 139 $popular_importers = json_decode( wp_remote_retrieve_body( $response ), true ); 136 140 137 if ( is_array( $popular_importers ) ) 138 set_site_transient( 'popular_importers_' . $locale, $popular_importers, 2 * DAY_IN_SECONDS );139 else141 if ( is_array( $popular_importers ) ) { 142 set_site_transient( $cache_key, $popular_importers, 2 * DAY_IN_SECONDS ); 143 } else { 140 144 $popular_importers = false; 145 } 141 146 } 142 147 143 148 if ( is_array( $popular_importers ) ) { … … 157 162 // slug => name, description, plugin slug, and register_importer() slug 158 163 'blogger' => array( 159 164 'name' => __( 'Blogger' ), 160 'description' => __( 'I nstall the Blogger importer to import posts, comments, and users from a Blogger blog.' ),165 'description' => __( 'Import posts, comments, and users from a Blogger blog.' ), 161 166 'plugin-slug' => 'blogger-importer', 162 167 'importer-id' => 'blogger', 163 168 ), 164 169 'wpcat2tag' => array( 165 170 'name' => __( 'Categories and Tags Converter' ), 166 'description' => __( ' Install the category/tag converter to convert existing categories to tags or tags to categories, selectively.' ),171 'description' => __( 'Convert existing categories to tags or tags to categories, selectively.' ), 167 172 'plugin-slug' => 'wpcat2tag-importer', 168 173 'importer-id' => 'wp-cat2tag', 169 174 ), 170 175 'livejournal' => array( 171 176 'name' => __( 'LiveJournal' ), 172 'description' => __( 'I nstall the LiveJournal importer to import posts from LiveJournal using their API.' ),177 'description' => __( 'Import posts from LiveJournal using their API.' ), 173 178 'plugin-slug' => 'livejournal-importer', 174 179 'importer-id' => 'livejournal', 175 180 ), 176 181 'movabletype' => array( 177 182 'name' => __( 'Movable Type and TypePad' ), 178 'description' => __( 'I nstall the Movable Type importer to import posts and comments from a Movable Type or TypePad blog.' ),183 'description' => __( 'Import posts and comments from a Movable Type or TypePad blog.' ), 179 184 'plugin-slug' => 'movabletype-importer', 180 185 'importer-id' => 'mt', 181 186 ), 182 187 'opml' => array( 183 188 'name' => __( 'Blogroll' ), 184 'description' => __( 'I nstall the blogroll importer to import links in OPML format.' ),189 'description' => __( 'Import links in OPML format.' ), 185 190 'plugin-slug' => 'opml-importer', 186 191 'importer-id' => 'opml', 187 192 ), 188 193 'rss' => array( 189 194 'name' => __( 'RSS' ), 190 'description' => __( 'I nstall the RSS importer to import posts from an RSS feed.' ),195 'description' => __( 'Import posts from an RSS feed.' ), 191 196 'plugin-slug' => 'rss-importer', 192 197 'importer-id' => 'rss', 193 198 ), 194 199 'tumblr' => array( 195 200 'name' => __( 'Tumblr' ), 196 'description' => __( 'I nstall the Tumblr importer to import posts & media from Tumblr using their API.' ),201 'description' => __( 'Import posts & media from Tumblr using their API.' ), 197 202 'plugin-slug' => 'tumblr-importer', 198 203 'importer-id' => 'tumblr', 199 204 ), 200 205 'wordpress' => array( 201 206 'name' => 'WordPress', 202 'description' => __( 'I nstall the WordPress importer to import posts, pages, comments, custom fields, categories, and tags from a WordPress export file.' ),207 'description' => __( 'Import posts, pages, comments, custom fields, categories, and tags from a WordPress export file.' ), 203 208 'plugin-slug' => 'wordpress-importer', 204 209 'importer-id' => 'wordpress', 205 210 ), -
src/wp-admin/js/updates.js
503 503 }, args ); 504 504 505 505 if ( 'import' === pagenow ) { 506 $message = $( ' a[href*="' + args.slug + '"]' );506 $message = $( '[data-slug="' + args.slug + '"]' ); 507 507 } else { 508 508 $message.text( wp.updates.l10n.installing ); 509 509 } … … 625 625 message: wp.updates.l10n.importerInstalledMsg.replace( '%s', response.activateUrl + '&from=import' ) 626 626 } ); 627 627 628 $( 'a[href*="' + response.slug + '"]' ) 629 .removeClass( 'thickbox open-plugin-details-modal updating-message' ) 630 .off( 'click' ) 631 .attr( 'href', response.activateUrl + '&from=import' ) 632 .attr( 'title', wp.updates.l10n.activateImporter ); 628 $( '[data-slug="' + response.slug + '"]' ) 629 .removeClass( 'install-now updating-message' ) 630 .addClass( 'activate-now' ) 631 .attr({ 632 'href': response.activateUrl + '&from=import', 633 'aria-label': wp.updates.l10n.activateImporterLabel.replace( '%s', response.pluginName ) 634 }) 635 .text( wp.updates.l10n.activateImporter ); 633 636 634 637 wp.a11y.speak( wp.updates.l10n.installedMsg, 'polite' ); 635 638 … … 649 652 * @param {string} response.errorMessage The error that occurred. 650 653 */ 651 654 wp.updates.installImporterError = function( response ) { 652 var errorMessage = wp.updates.l10n.installFailed.replace( '%s', response.errorMessage ); 655 var errorMessage = wp.updates.l10n.installFailed.replace( '%s', response.errorMessage ), 656 errorMessageText, 657 $installLink = $( '[data-slug="' + response.slug + '"]' ), 658 pluginName = $installLink.data( 'name' ); 653 659 654 660 if ( ! wp.updates.isValidResponse( response, 'install' ) ) { 655 661 return; … … 665 671 message: errorMessage 666 672 } ); 667 673 668 $( 'a[href*="' + response.slug + '"]' ).removeClass( 'updating-message' ); 674 $installLink 675 .removeClass( 'updating-message' ) 676 .attr( 'aria-label', wp.updates.l10n.installNowLabel.replace( '%s', pluginName ) ); 669 677 670 wp.a11y.speak( errorMessage, 'assertive' ); 678 // The error message may contain HTML (e.g. links) we need to strip out. 679 errorMessageText = $( '<p />' ).html( errorMessage ).text(); 680 wp.a11y.speak( errorMessageText, 'assertive' ); 671 681 672 682 $document.trigger( 'wp-importer-install-error', response ); 673 683 }; … … 1766 1776 } ); 1767 1777 1768 1778 /** 1779 * Click handler for importer plugins installs in the Import screen. 1780 * 1781 * @since 4.6.0 1782 * 1783 * @param {Event} event Event interface. 1784 */ 1785 $document.on( 'click', '.importer-item .install-now', function( event ) { 1786 var $button = $( event.target ), 1787 pluginName = $( this ).data( 'name' ); 1788 1789 event.preventDefault(); 1790 1791 if ( $button.hasClass( 'updating-message' ) ) { 1792 return; 1793 } 1794 1795 if ( wp.updates.shouldRequestFilesystemCredentials && ! wp.updates.ajaxLocked ) { 1796 wp.updates.requestFilesystemCredentials( event ); 1797 1798 $document.on( 'credential-modal-cancel', function() { 1799 1800 $button 1801 .removeClass( 'updating-message' ) 1802 .text( wp.updates.l10n.installNow ) 1803 .attr( 'aria-label', wp.updates.l10n.installNowLabel.replace( '%s', pluginName ) ); 1804 1805 wp.a11y.speak( wp.updates.l10n.updateCancel, 'polite' ); 1806 } ); 1807 } 1808 1809 wp.updates.installPlugin( { 1810 slug: $button.data( 'slug' ), 1811 success: wp.updates.installImporterSuccess, 1812 error: wp.updates.installImporterError 1813 } ); 1814 } ); 1815 1816 /** 1769 1817 * Click handler for plugin deletions. 1770 1818 * 1771 1819 * @since 4.6.0 -
src/wp-includes/script-loader.php
607 607 'update' => __( 'Update' ), 608 608 'updateNow' => __( 'Update Now' ), 609 609 'updateFailedShort' => __( 'Update Failed!' ), 610 /* translators: Error string for a failed update */610 /* translators: %s: Error string for a failed update */ 611 611 'updateFailed' => __( 'Update Failed: %s' ), 612 /* translators: Plugin name and version */612 /* translators: %s: Plugin name and version */ 613 613 'updatingLabel' => __( 'Updating %s...' ), // No ellipsis. 614 /* translators: Plugin name and version */614 /* translators: %s: Plugin name and version */ 615 615 'updatedLabel' => __( '%s updated!' ), 616 /* translators: Plugin name and version */616 /* translators: %s: Plugin name and version */ 617 617 'updateFailedLabel' => __( '%s update failed' ), 618 618 /* translators: JavaScript accessible string */ 619 619 'updatingMsg' => __( 'Updating... please wait.' ), // No ellipsis. … … 623 623 'updateCancel' => __( 'Update canceled.' ), 624 624 'beforeunload' => __( 'Updates may not complete if you navigate away from this page.' ), 625 625 'installNow' => __( 'Install Now' ), 626 /* translators: %s: Plugin name */ 627 'installNowLabel' => __( 'Install %s' ), 626 628 'installing' => __( 'Installing...' ), 627 629 'installed' => __( 'Installed!' ), 628 630 'installFailedShort' => __( 'Install Failed!' ), 629 /* translators: Error string for a failed installation */631 /* translators: %s: Error string for a failed installation */ 630 632 'installFailed' => __( 'Installation failed: %s' ), 631 /* translators: Plugin name and version */633 /* translators: %s: Plugin name and version */ 632 634 'pluginInstallingLabel' => _x( 'Installing %s...', 'plugin' ), // no ellipsis 633 /* translators: Theme name and version */635 /* translators: %s: Theme name and version */ 634 636 'themeInstallingLabel' => _x( 'Installing %s...', 'theme' ), // no ellipsis 635 /* translators: Plugin name and version */637 /* translators: %s: Plugin name and version */ 636 638 'pluginInstalledLabel' => _x( '%s installed!', 'plugin' ), 637 /* translators: Theme name and version */639 /* translators: %s: Theme name and version */ 638 640 'themeInstalledLabel' => _x( '%s installed!', 'theme' ), 639 /* translators: Plugin name and version */641 /* translators: %s: Plugin name and version */ 640 642 'pluginInstallFailedLabel' => _x( '%s installation failed', 'plugin' ), 641 /* translators: Theme name and version */643 /* translators: %s: Theme name and version */ 642 644 'themeInstallFailedLabel' => _x( '%s installation failed', 'theme' ), 643 645 'installingMsg' => __( 'Installing... please wait.' ), 644 646 'installedMsg' => __( 'Installation completed successfully.' ), 645 /* translators: Activation URL */646 'importerInstalledMsg' => __( 'Importer installed successfully. <a href="%s"> Activate plugin & run importer</a>' ),647 /* translators: %s: Activation URL */ 648 'importerInstalledMsg' => __( 'Importer installed successfully. <a href="%s">Run importer</a>' ), 647 649 /* translators: %s: Theme name */ 648 650 'aysDelete' => __( 'Are you sure you want to delete %s?' ), 649 651 /* translators: %s: Plugin name */ … … 662 664 'activatePluginLabel' => is_network_admin() ? _x( 'Network Activate %s', 'plugin' ) : _x( 'Activate %s', 'plugin' ), 663 665 /* translators: %s: Theme name */ 664 666 'activateThemeLabel' => is_network_admin() ? _x( 'Network Activate %s', 'theme' ) : _x( 'Activate %s', 'theme' ), 665 'activateImporter' => __( 'Activate importer' ), 667 'activateImporter' => __( 'Run Importer' ), 668 /* translators: %s: Importer Plugin name */ 669 'activateImporterLabel' => __( 'Run %s' ), 666 670 'unknownError' => __( 'An unknown error occurred' ), 667 671 'pluginsFound' => __( 'Number of plugins found: %d' ), 668 672 'noPluginsFound' => __( 'No plugins found. Try a different search.' ), -
tests/qunit/fixtures/updates.js
30 30 'themeInstallFailedLabel': '%s installation failed', 31 31 'installingMsg': 'Installing... please wait.', 32 32 'installedMsg': 'Installation completed successfully.', 33 'importerInstalledMsg': 'Importer installed successfully. <a href="%s"> Activate plugin & run importer</a>',33 'importerInstalledMsg': 'Importer installed successfully. <a href="%s">Run importer</a>', 34 34 'aysDelete': 'Are you sure you want to delete %s?', 35 35 'aysDeleteUninstall': 'Are you sure you want to delete %s and its data?', 36 36 'aysBulkDelete': 'Are you sure you want to delete the selected plugins and their data?', … … 43 43 'activateTheme': 'Activate', 44 44 'activatePluginLabel': 'Activate %s', 45 45 'activateThemeLabel': 'Activate %s', 46 'activateImporter': ' Activate importer',46 'activateImporter': 'Run Importer', 47 47 'unknownError': 'An unknown error occurred', 48 48 'pluginsFound': 'Number of plugins found: %d', 49 49 'noPluginsFound': 'No plugins found. Try a different search.'