<!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" />
<title>[38075] trunk: Import: Enhance accessibility on the Import screen.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/38075">38075</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/38075","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>ocean90</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-07-17 15:31:29 +0000 (Sun, 17 Jul 2016)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Import: Enhance accessibility on the Import screen.
* Remove title attributes.
* Show "Install Now" and "Details" links if the importer isn't installed yet.
* Show a "Run Importer" link if the importer is installed. It also handles activation if the plugin isn't activated.
* Add `aria-label` attributes to each link.
* Unify the importer descriptions to make them independent from the plugin state. The API was changed in [meta3690].
* Adjust JavaScript callbacks for ajaxified importer installs.
Props afercia, swissspidy, ocean90.
See <a href="https://core.trac.wordpress.org/ticket/24766">#24766</a>.
Fixes <a href="https://core.trac.wordpress.org/ticket/35191">#35191</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincsscommoncss">trunk/src/wp-admin/css/common.css</a></li>
<li><a href="#trunksrcwpadminimportphp">trunk/src/wp-admin/import.php</a></li>
<li><a href="#trunksrcwpadminincludesimportphp">trunk/src/wp-admin/includes/import.php</a></li>
<li><a href="#trunksrcwpadminjsupdatesjs">trunk/src/wp-admin/js/updates.js</a></li>
<li><a href="#trunksrcwpincludesscriptloaderphp">trunk/src/wp-includes/script-loader.php</a></li>
<li><a href="#trunktestsqunitfixturesupdatesjs">trunk/tests/qunit/fixtures/updates.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmincsscommoncss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/css/common.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/css/common.css 2016-07-17 13:28:13 UTC (rev 38074)
+++ trunk/src/wp-admin/css/common.css 2016-07-17 15:31:29 UTC (rev 38075)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2275,15 +2275,47 @@
</span><span class="cx" style="display: block; padding: 0 10px"> display: block;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.importers {
+ font-size: 16px;
+ width: auto;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> .importers td {
</span><span class="cx" style="display: block; padding: 0 10px"> padding-right: 14px;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ line-height: 1.5em;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.importers {
- font-size: 16px;
- width: auto;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.importers .import-system {
+ max-width: 250px;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.importers td.desc {
+ max-width: 500px;
+}
+
+.importer-title,
+.importer-desc,
+.importer-action {
+ display: block;
+}
+
+.importer-title {
+ color: #000;
+ font-size: 14px;
+ font-weight: 400;
+ margin-bottom: .2em;
+}
+
+.importer-action {
+ line-height: 20px; /* Same as with .updating-message */
+ color: #ddd;
+ margin-bottom: 1em;
+}
+
+.not-installed-main-site .importer-action {
+ color: #555;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> #post-body #post-body-content #namediv h3, /* Back-compat for pre-4.4 */
</span><span class="cx" style="display: block; padding: 0 10px"> #post-body #post-body-content #namediv h2 {
</span><span class="cx" style="display: block; padding: 0 10px"> margin-top: 0;
</span></span></pre></div>
<a id="trunksrcwpadminimportphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/import.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/import.php 2016-07-17 13:28:13 UTC (rev 38074)
+++ trunk/src/wp-admin/import.php 2016-07-17 15:31:29 UTC (rev 38075)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,10 +30,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( current_user_can( 'install_plugins' ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( current_user_can( 'install_plugins' ) ) {
+ // List of popular importer plugins from the WordPress.org API.
</ins><span class="cx" style="display: block; padding: 0 10px"> $popular_importers = wp_get_popular_importers();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-else
- $popular_importers = array();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+} else {
+ $popular_importers = array();
+}
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Detect and redirect invalid importers like 'movabletype', which is registered as 'mt'
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $_GET['invalid'] ) && isset( $popular_importers[ $_GET['invalid'] ] ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -66,7 +68,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <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>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Registered (already installed) importers. They're stored in the global $wp_importers.
</ins><span class="cx" style="display: block; padding: 0 10px"> $importers = get_importers();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If a popular importer is not registered, create a dummy registration that links to the plugin installer.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -75,6 +77,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $importers[ $pop_data['importer-id'] ] ) )
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Fill the array of registered (already installed) importers with data of the popular importers from the WordPress.org API.
</ins><span class="cx" style="display: block; padding: 0 10px"> $importers[ $pop_data['importer-id'] ] = array( $pop_data['name'], $pop_data['description'], 'install' => $pop_data['plugin-slug'] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -85,43 +89,106 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <table class="widefat importers striped">
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
- foreach ($importers as $importer_id => $data) {
- $action = '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ foreach ( $importers as $importer_id => $data ) {
+ $plugin_slug = $action = '';
+ $is_plugin_installed = false;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $data['install'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $plugin_slug = $data['install'];
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( file_exists( WP_PLUGIN_DIR . '/' . $plugin_slug ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Looks like Importer is installed, But not active
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Looks like an importer is installed, but not active.
</ins><span class="cx" style="display: block; padding: 0 10px"> $plugins = get_plugins( '/' . $plugin_slug );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !empty($plugins) ) {
- $keys = array_keys($plugins);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $plugins ) ) {
+ $keys = array_keys( $plugins );
</ins><span class="cx" style="display: block; padding: 0 10px"> $plugin_file = $plugin_slug . '/' . $keys[0];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $action = '<a href="' . esc_url(wp_nonce_url(admin_url('plugins.php?action=activate&plugin=' . $plugin_file . '&from=import'), 'activate-plugin_' . $plugin_file)) .
- '"title="' . esc_attr__('Activate importer') . '"">' . $data[0] . '</a>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $url = wp_nonce_url( add_query_arg( array(
+ 'action' => 'activate',
+ 'plugin' => $plugin_file,
+ 'from' => 'import',
+ ), admin_url( 'plugins.php' ) ), 'activate-plugin_' . $plugin_file );
+ $action = sprintf(
+ '<a href="%s" aria-label="%s">%s</a>',
+ esc_url( $url ),
+ /* translators: %s: Importer name */
+ esc_attr( sprintf( __( 'Run %s' ), $data[0] ) ),
+ __( 'Run Importer' )
+ );
+
+ $is_plugin_installed = true;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( empty($action) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( empty( $action ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( is_main_site() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $action = '<a href="' . esc_url( network_admin_url( 'plugin-install.php?tab=plugin-information&plugin=' . $plugin_slug .
- '&from=import&TB_iframe=true&width=600&height=550' ) ) . '" class="thickbox open-plugin-details-modal" title="' .
- esc_attr__('Install importer') . '">' . $data[0] . '</a>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $url = wp_nonce_url( add_query_arg( array(
+ 'action' => 'install-plugin',
+ 'plugin' => $plugin_slug,
+ 'from' => 'import',
+ ), self_admin_url( 'update.php' ) ), 'install-plugin_' . $plugin_slug );
+ $action = sprintf(
+ '<a href="%1$s" class="install-now" data-slug="%2$s" data-name="%3$s" aria-label="%4$s">%5$s</a>',
+ esc_url( $url ),
+ esc_attr( $plugin_slug ),
+ esc_attr( $data[0] ),
+ /* translators: %s: Importer name */
+ esc_attr( sprintf( __( 'Install %s' ), $data[0] ) ),
+ __( 'Install Now' )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $action = $data[0];
- $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' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $action = sprintf(
+ /* translators: URL to wp-admin/import.php */
+ __( 'This importer is not installed. Please install importers from <a href="%s">the main site</a>.' ),
+ get_admin_url( get_current_network_id(), 'import.php' )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $action = "<a href='" . esc_url( "admin.php?import=$importer_id" ) . "' title='" . esc_attr( wptexturize( strip_tags( $data[1] ) ) ) ."'>{$data[0]}</a>";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $url = add_query_arg( array(
+ 'import' => $importer_id,
+ ), self_admin_url( 'admin.php' ) );
+ $action = sprintf(
+ '<a href="%1$s" aria-label="%2$s">%3$s</a>',
+ esc_url( $url ),
+ /* translators: %s: Importer name */
+ esc_attr( sprintf( __( 'Run %s' ), $data[0] ) ),
+ __( 'Run Importer' )
+ );
+
+ $is_plugin_installed = true;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $is_plugin_installed && is_main_site() ) {
+ $url = add_query_arg( array(
+ 'tab' => 'plugin-information',
+ 'plugin' => $plugin_slug,
+ 'from' => 'import',
+ 'TB_iframe' => 'true',
+ 'width' => 600,
+ 'height' => 550,
+ ), network_admin_url( 'plugin-install.php' ) );
+ $action .= sprintf(
+ ' | <a href="%1$s" class="thickbox open-plugin-details-modal" aria-label="%2$s">%3$s</a>',
+ esc_url( $url ),
+ /* translators: %s: Importer name */
+ esc_attr( sprintf( __( 'More information about %s' ), $data[0] ) ),
+ __( 'Details' )
+ );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> echo "
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <tr>
- <td class='import-system row-title'>$action</td>
- <td class='desc'>{$data[1]}</td>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <tr class='importer-item'>
+ <td class='import-system'>
+ <span class='importer-title'>{$data[0]}</span>
+ <span class='importer-action'>{$action}</span>
+ </td>
+ <td class='desc'>
+ <span class='importer-desc'>{$data[1]}</span>
+ </td>
</ins><span class="cx" style="display: block; padding: 0 10px"> </tr>";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-?>
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </table>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminincludesimportphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/import.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/import.php 2016-07-17 13:28:13 UTC (rev 38074)
+++ trunk/src/wp-admin/includes/import.php 2016-07-17 15:31:29 UTC (rev 38075)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -126,18 +126,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> include( ABSPATH . WPINC . '/version.php' ); // include an unmodified $wp_version
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $locale = get_locale();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $popular_importers = get_site_transient( 'popular_importers_' . $locale );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $cache_key = 'popular_importers_' . md5( $locale . $wp_version );
+ $popular_importers = get_site_transient( $cache_key );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $popular_importers ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $url = add_query_arg( 'locale', get_locale(), 'http://api.wordpress.org/core/importers/1.1/' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $url = add_query_arg( array(
+ 'locale' => get_locale(),
+ 'version' => $wp_version,
+ ), 'http://api.wordpress.org/core/importers/1.1/' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $options = array( 'user-agent' => 'WordPress/' . $wp_version . '; ' . home_url() );
</span><span class="cx" style="display: block; padding: 0 10px"> $response = wp_remote_get( $url, $options );
</span><span class="cx" style="display: block; padding: 0 10px"> $popular_importers = json_decode( wp_remote_retrieve_body( $response ), true );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_array( $popular_importers ) )
- set_site_transient( 'popular_importers_' . $locale, $popular_importers, 2 * DAY_IN_SECONDS );
- else
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_array( $popular_importers ) ) {
+ set_site_transient( $cache_key, $popular_importers, 2 * DAY_IN_SECONDS );
+ } else {
</ins><span class="cx" style="display: block; padding: 0 10px"> $popular_importers = false;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_array( $popular_importers ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -157,49 +162,49 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // slug => name, description, plugin slug, and register_importer() slug
</span><span class="cx" style="display: block; padding: 0 10px"> 'blogger' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => __( 'Blogger' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description' => __( 'Install the Blogger importer to import posts, comments, and users from a Blogger blog.' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description' => __( 'Import posts, comments, and users from a Blogger blog.' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'plugin-slug' => 'blogger-importer',
</span><span class="cx" style="display: block; padding: 0 10px"> 'importer-id' => 'blogger',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'wpcat2tag' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => __( 'Categories and Tags Converter' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description' => __( 'Install the category/tag converter to convert existing categories to tags or tags to categories, selectively.' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description' => __( 'Convert existing categories to tags or tags to categories, selectively.' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'plugin-slug' => 'wpcat2tag-importer',
</span><span class="cx" style="display: block; padding: 0 10px"> 'importer-id' => 'wp-cat2tag',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'livejournal' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => __( 'LiveJournal' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description' => __( 'Install the LiveJournal importer to import posts from LiveJournal using their API.' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description' => __( 'Import posts from LiveJournal using their API.' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'plugin-slug' => 'livejournal-importer',
</span><span class="cx" style="display: block; padding: 0 10px"> 'importer-id' => 'livejournal',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'movabletype' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => __( 'Movable Type and TypePad' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description' => __( 'Install the Movable Type importer to import posts and comments from a Movable Type or TypePad blog.' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description' => __( 'Import posts and comments from a Movable Type or TypePad blog.' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'plugin-slug' => 'movabletype-importer',
</span><span class="cx" style="display: block; padding: 0 10px"> 'importer-id' => 'mt',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'opml' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => __( 'Blogroll' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description' => __( 'Install the blogroll importer to import links in OPML format.' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description' => __( 'Import links in OPML format.' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'plugin-slug' => 'opml-importer',
</span><span class="cx" style="display: block; padding: 0 10px"> 'importer-id' => 'opml',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'rss' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => __( 'RSS' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description' => __( 'Install the RSS importer to import posts from an RSS feed.' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description' => __( 'Import posts from an RSS feed.' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'plugin-slug' => 'rss-importer',
</span><span class="cx" style="display: block; padding: 0 10px"> 'importer-id' => 'rss',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'tumblr' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => __( 'Tumblr' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description' => __( 'Install the Tumblr importer to import posts & media from Tumblr using their API.' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description' => __( 'Import posts & media from Tumblr using their API.' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'plugin-slug' => 'tumblr-importer',
</span><span class="cx" style="display: block; padding: 0 10px"> 'importer-id' => 'tumblr',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'wordpress' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'WordPress',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description' => __( 'Install the WordPress importer to import posts, pages, comments, custom fields, categories, and tags from a WordPress export file.' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description' => __( 'Import posts, pages, comments, custom fields, categories, and tags from a WordPress export file.' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'plugin-slug' => 'wordpress-importer',
</span><span class="cx" style="display: block; padding: 0 10px"> 'importer-id' => 'wordpress',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span></span></pre></div>
<a id="trunksrcwpadminjsupdatesjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/js/updates.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/js/updates.js 2016-07-17 13:28:13 UTC (rev 38074)
+++ trunk/src/wp-admin/js/updates.js 2016-07-17 15:31:29 UTC (rev 38075)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -503,11 +503,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }, args );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'import' === pagenow ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $message = $( 'a[href*="' + args.slug + '"]' );
- } else {
- $message.text( wp.updates.l10n.installing );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $message = $( '[data-slug="' + args.slug + '"]' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $message.text( wp.updates.l10n.installing );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $message
</span><span class="cx" style="display: block; padding: 0 10px"> .addClass( 'updating-message' )
</span><span class="cx" style="display: block; padding: 0 10px"> .attr( 'aria-label', wp.updates.l10n.pluginInstallingLabel.replace( '%s', $message.data( 'name' ) ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -625,11 +625,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> message: wp.updates.l10n.importerInstalledMsg.replace( '%s', response.activateUrl + '&from=import' )
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $( 'a[href*="' + response.slug + '"]' )
- .removeClass( 'thickbox open-plugin-details-modal updating-message' )
- .off( 'click' )
- .attr( 'href', response.activateUrl + '&from=import' )
- .attr( 'title', wp.updates.l10n.activateImporter );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $( '[data-slug="' + response.slug + '"]' )
+ .removeClass( 'install-now updating-message' )
+ .addClass( 'activate-now' )
+ .attr({
+ 'href': response.activateUrl + '&from=import',
+ 'aria-label': wp.updates.l10n.activateImporterLabel.replace( '%s', response.pluginName )
+ })
+ .text( wp.updates.l10n.activateImporter );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp.a11y.speak( wp.updates.l10n.installedMsg, 'polite' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -649,7 +652,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param {string} response.errorMessage The error that occurred.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> wp.updates.installImporterError = function( response ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var errorMessage = wp.updates.l10n.installFailed.replace( '%s', response.errorMessage );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var errorMessage = wp.updates.l10n.installFailed.replace( '%s', response.errorMessage ),
+ $installLink = $( '[data-slug="' + response.slug + '"]' ),
+ pluginName = $installLink.data( 'name' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! wp.updates.isValidResponse( response, 'install' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -665,7 +670,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> message: errorMessage
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $( 'a[href*="' + response.slug + '"]' ).removeClass( 'updating-message' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $installLink
+ .removeClass( 'updating-message' )
+ .text( wp.updates.l10n.installNow )
+ .attr( 'aria-label', wp.updates.l10n.installNowLabel.replace( '%s', pluginName ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp.a11y.speak( errorMessage, 'assertive' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1766,6 +1774,44 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Click handler for importer plugins installs in the Import screen.
+ *
+ * @since 4.6.0
+ *
+ * @param {Event} event Event interface.
+ */
+ $document.on( 'click', '.importer-item .install-now', function( event ) {
+ var $button = $( event.target ),
+ pluginName = $( this ).data( 'name' );
+
+ event.preventDefault();
+
+ if ( $button.hasClass( 'updating-message' ) ) {
+ return;
+ }
+
+ if ( wp.updates.shouldRequestFilesystemCredentials && ! wp.updates.ajaxLocked ) {
+ wp.updates.requestFilesystemCredentials( event );
+
+ $document.on( 'credential-modal-cancel', function() {
+
+ $button
+ .removeClass( 'updating-message' )
+ .text( wp.updates.l10n.installNow )
+ .attr( 'aria-label', wp.updates.l10n.installNowLabel.replace( '%s', pluginName ) );
+
+ wp.a11y.speak( wp.updates.l10n.updateCancel, 'polite' );
+ } );
+ }
+
+ wp.updates.installPlugin( {
+ slug: $button.data( 'slug' ),
+ success: wp.updates.installImporterSuccess,
+ error: wp.updates.installImporterError
+ } );
+ } );
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Click handler for plugin deletions.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.6.0
</span></span></pre></div>
<a id="trunksrcwpincludesscriptloaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/script-loader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/script-loader.php 2016-07-17 13:28:13 UTC (rev 38074)
+++ trunk/src/wp-includes/script-loader.php 2016-07-17 15:31:29 UTC (rev 38075)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -607,13 +607,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'update' => __( 'Update' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'updateNow' => __( 'Update Now' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'updateFailedShort' => __( 'Update Failed!' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: Error string for a failed update */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: Error string for a failed update */
</ins><span class="cx" style="display: block; padding: 0 10px"> 'updateFailed' => __( 'Update Failed: %s' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: Plugin name and version */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: Plugin name and version */
</ins><span class="cx" style="display: block; padding: 0 10px"> 'updatingLabel' => __( 'Updating %s...' ), // No ellipsis.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: Plugin name and version */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: Plugin name and version */
</ins><span class="cx" style="display: block; padding: 0 10px"> 'updatedLabel' => __( '%s updated!' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: Plugin name and version */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: Plugin name and version */
</ins><span class="cx" style="display: block; padding: 0 10px"> 'updateFailedLabel' => __( '%s update failed' ),
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: JavaScript accessible string */
</span><span class="cx" style="display: block; padding: 0 10px"> 'updatingMsg' => __( 'Updating... please wait.' ), // No ellipsis.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -623,27 +623,29 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'updateCancel' => __( 'Update canceled.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'beforeunload' => __( 'Updates may not complete if you navigate away from this page.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'installNow' => __( 'Install Now' ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: Plugin name */
+ 'installNowLabel' => __( 'Install %s' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'installing' => __( 'Installing...' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'installed' => __( 'Installed!' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'installFailedShort' => __( 'Install Failed!' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: Error string for a failed installation */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: Error string for a failed installation */
</ins><span class="cx" style="display: block; padding: 0 10px"> 'installFailed' => __( 'Installation failed: %s' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: Plugin name and version */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: Plugin name and version */
</ins><span class="cx" style="display: block; padding: 0 10px"> 'pluginInstallingLabel' => _x( 'Installing %s...', 'plugin' ), // no ellipsis
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: Theme name and version */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: Theme name and version */
</ins><span class="cx" style="display: block; padding: 0 10px"> 'themeInstallingLabel' => _x( 'Installing %s...', 'theme' ), // no ellipsis
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: Plugin name and version */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: Plugin name and version */
</ins><span class="cx" style="display: block; padding: 0 10px"> 'pluginInstalledLabel' => _x( '%s installed!', 'plugin' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: Theme name and version */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: Theme name and version */
</ins><span class="cx" style="display: block; padding: 0 10px"> 'themeInstalledLabel' => _x( '%s installed!', 'theme' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: Plugin name and version */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: Plugin name and version */
</ins><span class="cx" style="display: block; padding: 0 10px"> 'pluginInstallFailedLabel' => _x( '%s installation failed', 'plugin' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: Theme name and version */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: Theme name and version */
</ins><span class="cx" style="display: block; padding: 0 10px"> 'themeInstallFailedLabel' => _x( '%s installation failed', 'theme' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'installingMsg' => __( 'Installing... please wait.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'installedMsg' => __( 'Installation completed successfully.' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: Activation URL */
- 'importerInstalledMsg' => __( 'Importer installed successfully. <a href="%s">Activate plugin & run importer</a>' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: Activation URL */
+ 'importerInstalledMsg' => __( 'Importer installed successfully. <a href="%s">Run importer</a>' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Theme name */
</span><span class="cx" style="display: block; padding: 0 10px"> 'aysDelete' => __( 'Are you sure you want to delete %s?' ),
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Plugin name */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -661,7 +663,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'activatePluginLabel' => is_network_admin() ? _x( 'Network Activate %s', 'plugin' ) : _x( 'Activate %s', 'plugin' ),
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Theme name */
</span><span class="cx" style="display: block; padding: 0 10px"> 'activateThemeLabel' => is_network_admin() ? _x( 'Network Activate %s', 'theme' ) : _x( 'Activate %s', 'theme' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'activateImporter' => __( 'Activate importer' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'activateImporter' => __( 'Run Importer' ),
+ /* translators: %s: Importer name */
+ 'activateImporterLabel' => __( 'Run %s' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'unknownError' => __( 'An unknown error occurred' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'pluginsFound' => __( 'Number of plugins found: %d' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'noPluginsFound' => __( 'No plugins found. Try a different search.' ),
</span></span></pre></div>
<a id="trunktestsqunitfixturesupdatesjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/qunit/fixtures/updates.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/qunit/fixtures/updates.js 2016-07-17 13:28:13 UTC (rev 38074)
+++ trunk/tests/qunit/fixtures/updates.js 2016-07-17 15:31:29 UTC (rev 38075)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,7 +30,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'themeInstallFailedLabel': '%s installation failed',
</span><span class="cx" style="display: block; padding: 0 10px"> 'installingMsg': 'Installing... please wait.',
</span><span class="cx" style="display: block; padding: 0 10px"> 'installedMsg': 'Installation completed successfully.',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'importerInstalledMsg': 'Importer installed successfully. <a href="%s">Activate plugin & run importer</a>',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'importerInstalledMsg': 'Importer installed successfully. <a href="%s">Run importer</a>',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'aysDelete': 'Are you sure you want to delete %s?',
</span><span class="cx" style="display: block; padding: 0 10px"> 'aysDeleteUninstall': 'Are you sure you want to delete %s and its data?',
</span><span class="cx" style="display: block; padding: 0 10px"> 'aysBulkDelete': 'Are you sure you want to delete the selected plugins and their data?',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -43,7 +43,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'activateTheme': 'Activate',
</span><span class="cx" style="display: block; padding: 0 10px"> 'activatePluginLabel': 'Activate %s',
</span><span class="cx" style="display: block; padding: 0 10px"> 'activateThemeLabel': 'Activate %s',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'activateImporter': 'Activate importer',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'activateImporter': 'Run Importer',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'unknownError': 'An unknown error occurred',
</span><span class="cx" style="display: block; padding: 0 10px"> 'pluginsFound': 'Number of plugins found: %d',
</span><span class="cx" style="display: block; padding: 0 10px"> 'noPluginsFound': 'No plugins found. Try a different search.'
</span></span></pre>
</div>
</div>
</body>
</html>