Wordpress 2.9

[autoinstalls/wordpress.git] / wp-admin / import / greymatter.php

diff --git a/wp-admin/import/greymatter.php b/wp-admin/import/greymatter.php
index 58aa7577155270ba177a8067d04e4ed314f05bd9..47c15d4b1cb7337630005d1fd45f63c2f164650a 100644 (file)
--- a/wp-admin/import/greymatter.php
+++ b/wp-admin/import/greymatter.php
@@ -1,11 +1,26 @@
 <?php
 <?php

-
+/**
+ * GreyMatter Importer
+ *
+ * @package WordPress
+ * @subpackage Importer
+ */
+
+/**
+ * GreyMatter Importer class
+ *
+ * Basic GreyMatter to WordPress importer, will import posts, comments, and
+ * posts karma.
+ *
+ * @since unknown
+ */

 class GM_Import {
 
        var $gmnames = array ();
 
        function header() {
                echo '<div class="wrap">';
 class GM_Import {
 
        var $gmnames = array ();
 
        function header() {
                echo '<div class="wrap">';

+               screen_icon();

                echo '<h2>'.__('Import GreyMatter').'</h2>';
        }
 
                echo '<h2>'.__('Import GreyMatter').'</h2>';
        }
 


@@ -31,7 +46,7 @@ class GM_Import {
 </ul>
 <p>&nbsp;</p>
 
 </ul>
 <p>&nbsp;</p>
 

-<form name="stepOne" method="get">
+<form name="stepOne" method="get" action="">

 <input type="hidden" name="import" value="greymatter" />
 <input type="hidden" name="step" value="1" />
 <?php wp_nonce_field('import-greymatter'); ?>
 <input type="hidden" name="import" value="greymatter" />
 <input type="hidden" name="step" value="1" />
 <?php wp_nonce_field('import-greymatter'); ?>


@@ -46,13 +61,12 @@ class GM_Import {
 <td><input type="text" style="width:300px" name="archivespath" id="archivespath" value="/home/my/site/cgi-bin/greymatter/archives/" /></td>
 </tr>
 <tr>
 <td><input type="text" style="width:300px" name="archivespath" id="archivespath" value="/home/my/site/cgi-bin/greymatter/archives/" /></td>
 </tr>
 <tr>

-<td><label for="lastentry"><?php _e("Last entry's number:") ?></label></td>
+<td><label for="lastentry"><?php _e('Last entry&#8217;s number:') ?></label></td>

 <td><input type="text" name="lastentry" id="lastentry" value="00000001" /><br />
 <td><input type="text" name="lastentry" id="lastentry" value="00000001" /><br />

-       <?php _e("This importer will search for files 00000001.cgi to 000-whatever.cgi,<br />so you need to enter the number of the last GM post here.<br />(if you don't know that number, just log into your FTP and look it out<br />in the entries' folder)") ?></td>
+       <?php _e('This importer will search for files 00000001.cgi to 000-whatever.cgi,<br />so you need to enter the number of the last GM post here.<br />(if you don&#8217;t know that number, just log in to your FTP and look it out<br />in the entries&#8217; folder)') ?></td>

 </tr>
 </table>
 </tr>
 </table>

-</p>
-<p><input type="submit" name="submit" value="<?php _e('Start Importing') ?>" class="button" /></p>
+<p class="submit"><input type="submit" name="submit" class="button" value="<?php esc_attr_e('Start Importing') ?>" /></p>

 </form>
 <?php
                $this->footer();
 </form>
 <?php
                $this->footer();


@@ -269,12 +283,12 @@ class GM_Import {
                                }
                                if ($numAddedComments > 0) {
                                        echo ': ';
                                }
                                if ($numAddedComments > 0) {
                                        echo ': ';

-                               printf( __ngettext('imported %s comment', 'imported %s comments', $numAddedComments) , $numAddedComments);
+                               printf( _n('imported %s comment', 'imported %s comments', $numAddedComments) , $numAddedComments);

                                }
                                $preExisting = $numComments - numAddedComments;
                                if ($preExisting > 0) {
                                        echo ' ';
                                }
                                $preExisting = $numComments - numAddedComments;
                                if ($preExisting > 0) {
                                        echo ' ';

-                                       printf( __ngettext( 'ignored %s pre-existing comment', 'ignored %s pre-existing comments', $preExisting ) , $preExisting);
+                                       printf( _n( 'ignored %s pre-existing comment', 'ignored %s pre-existing comments', $preExisting ) , $preExisting);

                                }
                        }
                        echo '... <strong>'.__('Done').'</strong></li>';
                                }
                        }
                        echo '... <strong>'.__('Done').'</strong></li>';