Changes in trunk/wp-admin/import/mt.php [4370:3387]

File:

• trunk/wp-admin/import/mt.php (modified) (13 diffs)

trunk/wp-admin/import/mt.php

@@ -12 +12 @@
     function header() {
         echo '<div class="wrap">';
-        echo '<h2>'.__('Import Movable Type and TypePad').'</h2>';
+        echo '<h2>'.__('Import Movable Type').'</h2>';
     }
 
@@ -22 +22 @@
         $this->header();
 ?>
-<div class="narrow">
 <p><?php _e('Howdy! We&#8217;re about to begin the process to import all of your Movable Type entries into WordPress. To begin, select a file to upload and click Import.'); ?></p>
 <?php wp_import_upload_form( add_query_arg('step', 1) ); ?>
     <p><?php _e('The importer is smart enough not to import duplicates, so you can run this multiple times without worry if&#8212;for whatever reason&#8212;it doesn\'t finish. If you get an <strong>out of memory</strong> error try splitting up the import file into pieces.'); ?> </p>
-</div>
 <?php
         $this->footer();
@@ -35 +33 @@
         $users = $wpdb->get_results("SELECT * FROM $wpdb->users ORDER BY ID");
 ?><select name="userselect[<?php echo $n; ?>]">
-    <option value="#NONE#"><?php _e('- Select -') ?></option>
+    <option value="#NONE#">- Select -</option>
     <?php
 
@@ -137 +135 @@
     function mt_authors_form() {
 ?>
-<div class="wrap">
-<h2><?php _e('Assign Authors'); ?></h2>
 <p><?php _e('To make it easier for you to edit and save the imported posts and drafts, you may want to change the name of the author of the posts. For example, you may want to import all the entries as <code>admin</code>s entries.'); ?></p>
 <p><?php _e('Below, you can see the names of the authors of the MovableType posts in <i>italics</i>. For each of these names, you can either pick an author in your WordPress installation from the menu, or enter a name for the author in the textbox.'); ?></p>
@@ -151 +147 @@
         foreach ($authors as $author) {
             ++ $j;
-            echo '<li>'.__('Current author:').' <strong>'.$author.'</strong><br />'.sprintf(__('Create user %1$s or map to existing'), ' <input type="text" value="'.$author.'" name="'.'user[]'.'" maxlength="30"> <br />');
+            echo '<li><i>'.$author.'</i><br />'.'<input type="text" value="'.$author.'" name="'.'user[]'.'" maxlength="30">';
             $this->users_form($j);
             echo '</li>';
         }
 
-        echo '<input type="submit" value="'.__('Submit').'">'.'<br/>';
+        echo '<input type="submit" value="Submit">'.'<br/>';
         echo '</form>';
-        echo '</ol></div>';
-
+        echo '</ol>';
+
+        flush();
     }
 
@@ -165 +162 @@
         $file = wp_import_handle_upload();
         if ( isset($file['error']) ) {
-            $this->header();
-            echo '<p>'.__('Sorry, there has been an error').'.</p>';
-            echo '<p><strong>' . $file['error'] . '</strong></p>';
-            $this->footer();
+            echo $file['error'];
             return;
         }
@@ -181 +175 @@
         global $wpdb;
         $i = -1;
-        echo "<div class='wrap'><ol>";
+        echo "<ol>";
         foreach ($this->posts as $post) {
             if ('' != trim($post)) {
@@ -200 +194 @@
                 // We want the excerpt
                 preg_match("|-----\nEXCERPT:(.*)|s", $post, $excerpt);
-                $post_excerpt = $wpdb->escape(trim($excerpt[1]));
+                $excerpt = $wpdb->escape(trim($excerpt[1]));
                 $post = preg_replace("|(-----\nEXCERPT:.*)|s", '', $post);
 
@@ -337 +331 @@
                 }
                 if ( $num_comments )
-                    printf(' '.__('(%s comments)'), $num_comments);
+                    printf(__('(%s comments)'), $num_comments);
 
                 // Finally the pings
@@ -385 +379 @@
                 }
                 if ( $num_pings )
-                    printf(' '.__('(%s pings)'), $num_pings);
-
+                    printf(__('(%s pings)'), $num_pings);
+                
                 echo "</li>";
             }
+            flush();
         }
 
@@ -395 +390 @@
         wp_import_cleanup($this->id);
 
-        echo '<h3>'.sprintf(__('All done. <a href="%s">Have fun!</a>'), get_option('home')).'</h3></div>';
+        echo '<h3>'.sprintf(__('All done. <a href="%s">Have fun!</a>'), get_option('home')).'</h3>';
     }
 
     function import() {
         $this->id = (int) $_GET['id'];
-        
         $this->file = get_attached_file($this->id);
         $this->get_authors_from_post();
@@ -427 +421 @@
 
     function MT_Import() {
-        // Nothing.
+        // Nothing. 
     }
 }
@@ -433 +427 @@
 $mt_import = new MT_Import();
 
-register_importer('mt', __('Movable Type and TypePad'), __('Imports <strong>posts and comments</strong> from your Movable Type or TypePad blog'), array ($mt_import, 'dispatch'));
+register_importer('mt', 'Movable Type', __('Import posts and comments from your Movable Type blog'), array ($mt_import, 'dispatch'));
 ?>