Ticket #3490: term-blogspot-retired.diff

trunk/wp-admin/import/blogger.php

@@ -7 +7 @@
 
         // Shows the welcome screen and the magic iframe.
         function greet() {
-                $title = __('Import Blogger or Blogspot');
+                $title = __('Import Blogger');
                 $welcome = __('Howdy! This importer allows you to import posts and comments from your Blogger account into your WordPress blog.');
                 $noiframes = __('This feature requires iframe support.');
                 $warning = js_escape(__('This will delete everything saved by the Blogger importer except your posts and comments. Are you sure you want to do this?'));
@@ -15 +15 @@
                 $incompat = __('Your web server is not properly configured to use this importer. Please enable the CURL extension for PHP and then reload this page.');
 
                 echo "<div class='wrap'><h2>$title</h2><p>$welcome</p>";
+                echo "<p>" . __('Please note that this importer <em>does not work with Blogger Beta</em>.') . "</p>";
                 if ( function_exists('curl_init') )
                         echo "<iframe src='admin.php?import=blogger&amp;noheader=true' height='350px' width = '99%'>$noiframes</iframe><p><a href='admin.php?import=blogger&amp;restart=true&amp;noheader=true' onclick='return confirm(\"$warning\")'>$reset</a></p>";
                 else
@@ -662 +663 @@
 
 $blogger_import = new Blogger_Import();
 
-register_importer('blogger', __('Blogger or Blog*Spot'), __('Import posts, comments, and users from a Blogger or Blog*Spot blog'), array ($blogger_import, 'start'));
+register_importer('blogger', __('Blogger'), __('Import posts, comments, and users from a Blogger blog'), array ($blogger_import, 'start'));
 
 ?>

2.0/wp-admin/import/blogger.php

@@ -15 +15 @@
                 $incompat = __('Your web server is not properly configured to use this importer. Please enable the CURL extension for PHP and then reload this page.');
 
                 echo "<div class='wrap'><h2>$title</h2><p>$welcome</p>";
+                echo "<p>" . __('Please note that this importer <em>does not work with Blogger Beta</em>.') . "</p>";
                 if ( function_exists('curl_init') )
                         echo "<iframe src='admin.php?import=blogger&amp;noheader=true' height='350px' width = '99%'>$noiframes</iframe><p><a href='admin.php?import=blogger&amp;restart=true&amp;noheader=true' onclick='return confirm(\"$warning\")'>$reset</a></p>";
                 else
@@ -662 +663 @@
 
 $blogger_import = new Blogger_Import();
 
-register_importer('blogger', __('Blogger and Blogspot'), __('Import <strong>posts and comments</strong> from your Blogger account'), array ($blogger_import, 'start'));
+register_importer('blogger', __('Blogger'), __('Import <strong>posts and comments</strong> from your Blogger account'), array ($blogger_import, 'start'));
 
 ?>