WordPress.org
Get WordPress

Make WordPress Core

Ticket #2724: 2724.diff

File 2724.diff, 16.9 KB (added by MichaelH, 20 years ago)

import and export text ui changes

  • wp-admin/export.php

     
    1111
    1212<div class="wrap">
    1313<h2><?php _e('Export'); ?></h2>
    14 <p><?php _e('This will allow you to download an export of your WordPress posts and comments in a XML format.'); ?></p>
    15 <p>We need some more text here. Maybe talking about the export file or how to save it.</p>
     14<p><?php _e('This will allow you to create and download an export of your WordPress posts, comments, and pages in a XML format.'); ?></p>
     15<p>Once you've saved the download file, you can use the Import function on another WordPress blog to import this blog.</p>
    1616<form action="" method="get">
    1717<p class="submit"><input type="submit" name="submit" value="<?php _e('Download Export File'); ?> &raquo;" />
    1818<input type="hidden" name="download" value="true" />

  • wp-admin/import.php

     
    77
    88<div class="wrap">
    99<h2><?php _e('Import'); ?></h2>
    10 <p><?php _e('If you have posts or comments in another system WordPress can import them into your current blog. To get started, choose a system to import from below:'); ?></p>
     10<p><?php _e('If you have posts or comments in another system, WordPress can import those into this blog. To get started, choose a system to import from below:'); ?></p>
    1111
    1212<?php
    1313

  • wp-admin/import/blogger.php

     
    77
    88        // Shows the welcome screen and the magic iframe.
    99        function greet() {
    10                 $title = __('Import Blogger');
     10                $title = __('Import Blogger or Blogspot');
    1111                $welcome = __('Howdy! This importer allows you to import posts and comments from your Blogger account into your WordPress blog.');
    1212                $noiframes = __('This feature requires iframe support.');
    1313                $warning = __('This will delete everything saved by the Blogger importer except your posts and comments. Are you sure you want to do this?');
    … …  
    662662
    663663$blogger_import = new Blogger_Import();
    664664
    665 register_importer('blogger', 'Blogger and Blogspot', __('Import <strong>posts and comments</strong> from your Blogger account'), array ($blogger_import, 'start'));
     665register_importer('blogger', 'Blogger or Blogspot', __('Import posts, comments, and users from a Blogger or Blogspot blog'), array ($blogger_import, 'start'));
    666666
    667667?>

  • wp-admin/import/dotclear.php

     
    132132        function header()
    133133        {
    134134                echo '<div class="wrap">';
    135                 echo '<h2>'.__('Import Dotclear').'</h2>';
     135                echo '<h2>'.__('Import DotClear').'</h2>';
    136136                echo '<p>'.__('Steps may take a few minutes depending on the size of your database. Please be patient.').'</p>';
    137137        }
    138138
    … …  
    143143
    144144        function greet()
    145145        {
    146                 echo '<p>'.__('Howdy! This importer allows you to extract posts from a Dotclear database into your blog.  Mileage may vary.').'</p>';
    147                 echo '<p>'.__('Your Dotclear Configuration settings are as follows:').'</p>';
     146                echo '<p>'.__('Howdy! This will import categories, users, posts, comments, and links from a DotClear database into this blog.  Mileage may vary.').'</p>';
     147                echo '<p>'.__('Your DotClear Configuration settings are as follows:').'</p>';
    148148                echo '<form action="admin.php?import=dotclear&amp;step=1" method="post">';
    149149                $this->db_form();
    150150                echo '<input type="submit" name="submit" value="'.__('Import Categories').'" />';
    … …  
    626626
    627627        function tips()
    628628        {
    629                 echo '<p>'.__('Welcome to WordPress.  We hope (and expect!) that you will find this platform incredibly rewarding!  As a new WordPress user coming from Dotclear, there are some things that we would like to point out.  Hopefully, they will help your transition go as smoothly as possible.').'</p>';
     629                echo '<p>'.__('Welcome to WordPress.  We hope (and expect!) that you will find this platform incredibly rewarding!  As a new WordPress user coming from DotClear, there are some things that we would like to point out.  Hopefully, they will help your transition go as smoothly as possible.').'</p>';
    630630                echo '<h3>'.__('Users').'</h3>';
    631                 echo '<p>'.sprintf(__('You have already setup WordPress and have been assigned an administrative login and password.  Forget it.  You didn\'t have that login in Dotclear, why should you have it here?  Instead we have taken care to import all of your users into our system.  Unfortunately there is one downside.  Because both WordPress and Dotclear uses a strong encryption hash with passwords, it is impossible to decrypt it and we are forced to assign temporary passwords to all your users.  <strong>Every user has the same username, but their passwords are reset to password123.</strong>  So <a href="%1$s">Login</a> and change it.'), '/wp-login.php').'</p>';
     631                echo '<p>'.sprintf(__('You have already setup WordPress and have been assigned an administrative login and password.  Forget it.  You didn\'t have that login in DotClear, why should you have it here?  Instead we have taken care to import all of your users into our system.  Unfortunately there is one downside.  Because both WordPress and DotClear uses a strong encryption hash with passwords, it is impossible to decrypt it and we are forced to assign temporary passwords to all your users.  <strong>Every user has the same username, but their passwords are reset to password123.</strong>  So <a href="%1$s">Login</a> and change it.'), '/wp-login.php').'</p>';
    632632                echo '<h3>'.__('Preserving Authors').'</h3>';
    633633                echo '<p>'.__('Secondly, we have attempted to preserve post authors.  If you are the only author or contributor to your blog, then you are safe.  In most cases, we are successful in this preservation endeavor.  However, if we cannot ascertain the name of the writer due to discrepancies between database tables, we assign it to you, the administrative user.').'</p>';
    634634                echo '<h3>'.__('Textile').'</h3>';
    635                 echo '<p>'.__('Also, since you\'re coming from Dotclear, you probably have been using Textile to format your comments and posts.  If this is the case, we recommend downloading and installing <a href="http://www.huddledmasses.org/2004/04/19/wordpress-plugin-textile-20/">Textile for WordPress</a>.  Trust me... You\'ll want it.').'</p>';
     635                echo '<p>'.__('Also, since you\'re coming from DotClear, you probably have been using Textile to format your comments and posts.  If this is the case, we recommend downloading and installing <a href="http://www.huddledmasses.org/2004/04/19/wordpress-plugin-textile-20/">Textile for WordPress</a>.  Trust me... You\'ll want it.').'</p>';
    636636                echo '<h3>'.__('WordPress Resources').'</h3>';
    637637                echo '<p>'.__('Finally, there are numerous WordPress resources around the internet.  Some of them are:').'</p>';
    638638                echo '<ul>';
    … …  
    646646        function db_form()
    647647        {
    648648                echo '<ul>';
    649                 printf('<li><label for="dbuser">%s</label> <input type="text" name="dbuser" /></li>', __('Dotclear Database User:'));
    650                 printf('<li><label for="dbpass">%s</label> <input type="password" name="dbpass" /></li>', __('Dotclear Database Password:'));
    651                 printf('<li><label for="dbname">%s</label> <input type="text" name="dbname" /></li>', __('Dotclear Database Name:'));
    652                 printf('<li><label for="dbhost">%s</label> <input type="text" name="dbhost" value="localhost" /></li>', __('Dotclear Database Host:'));
    653                 printf('<li><label for="dbprefix">%s</label> <input type="text" name="dbprefix" value="dc_"/></li>', __('Dotclear Table prefix:'));
     649                printf('<li><label for="dbuser">%s</label> <input type="text" name="dbuser" /></li>', __('DotClear Database User:'));
     650                printf('<li><label for="dbpass">%s</label> <input type="password" name="dbpass" /></li>', __('DotClear Database Password:'));
     651                printf('<li><label for="dbname">%s</label> <input type="text" name="dbname" /></li>', __('DotClear Database Name:'));
     652                printf('<li><label for="dbhost">%s</label> <input type="text" name="dbhost" value="localhost" /></li>', __('DotClear Database Host:'));
     653                printf('<li><label for="dbprefix">%s</label> <input type="text" name="dbprefix" value="dc_"/></li>', __('DotClear Table prefix:'));
    654654                printf('<li><label for="dccharset">%s</label> <input type="text" name="dccharset" value="ISO-8859-15"/></li>', __('Originating character set:'));
    655655                echo '</ul>';
    656656        }
    … …  
    743743}
    744744
    745745$dc_import = new Dotclear_Import();
    746 register_importer('dotclear', 'Dotclear', __('Import posts from a Dotclear Blog'), array ($dc_import, 'dispatch'));
     746register_importer('dotclear', 'DotClear', __('Import categories, users, posts, comments, and links from a DotClear blog'), array ($dc_import, 'dispatch'));
    747747?>

  • wp-admin/import/greymatter.php

     
    1616        function greet() {
    1717                $this->header();
    1818?>
    19 <p>This is a basic GreyMatter to WordPress import script.</p>
     19<p>This is a basic Greymatter to WordPress import script.</p>
    2020<p>What it does:</p>
    2121<ul>
    2222<li>Parses gm-authors.cgi to import (new) authors. Everyone is imported at level 1.</li>
    … …  
    3434<form name="stepOne" method="get">
    3535<input type="hidden" name="import" value="greymatter" />
    3636<input type="hidden" name="step" value="1" />
    37 <h3>Second step: GreyMatter details:</h3>
     37<h3>Second step: Greymatter details:</h3>
    3838<p><table cellpadding="0">
    3939<tr>
    40 <td>Path to GM files:</td>
     40<td>Path to Greymatter files:</td>
    4141<td><input type="text" style="width:300px" name="gmpath" value="/home/my/site/cgi-bin/greymatter/" /></td>
    4242</tr>
    4343<tr>
    44 <td>Path to GM entries:</td>
     44<td>Path to Greymatter entries:</td>
    4545<td><input type="text" style="width:300px" name="archivespath" value="/home/my/site/cgi-bin/greymatter/archives/" /></td>
    4646</tr>
    4747<tr>
    48 <td colspan="2"><br />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>
     48<td colspan="2"><br />This importer will search for files 00000001.cgi to 000-whatever.cgi,<br />so you need to enter the number of the last Greymatter 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>
    4949</tr>
    5050<tr>
    5151<td>Last entry's number:</td>
    … …  
    308308
    309309$gm_import = new GM_Import();
    310310
    311 register_importer('greymatter', 'Greymatter', __('Import posts and comments from your Greymatter blog'), array ($gm_import, 'dispatch'));
     311register_importer('greymatter', 'Greymatter', __('Import users, posts, and comments from a Greymatter blog'), array ($gm_import, 'dispatch'));
    312312?>

  • wp-admin/import/livejournal.php

     
    2020        }
    2121
    2222        function greet() {
    23                 echo '<p>'.__('Howdy! This importer allows you to extract posts from LiveJournal XML export file into your blog.  Pick a LiveJournal file to upload and click Import.').'</p>';
     23                echo '<p>'.__('Howdy! Upload your LiveJournal XML export file and we&#8217;ll import the posts into this blog.').'</p>';
     24                echo '<p>'.__('Choose a LiveJournal XML file to upload, then click Upload file and import.').'</p>';
    2425                wp_import_upload_form("admin.php?import=livejournal&amp;step=1");
    2526        }
    2627
    … …  
    164165
    165166$livejournal_import = new LJ_Import();
    166167
    167 register_importer('livejournal', 'LiveJournal', __('Import posts from LiveJournal'), array ($livejournal_import, 'dispatch'));
     168register_importer('livejournal', 'LiveJournal', __('Import posts from a LiveJournal XML export file'), array ($livejournal_import, 'dispatch'));
    168169?>

  • wp-admin/import/mt.php

     
    1111
    1212        function header() {
    1313                echo '<div class="wrap">';
    14                 echo '<h2>'.__('Import Movable Type and Typepad').'</h2>';
     14                echo '<h2>'.__('Import Movable Type or Typepad').'</h2>';
    1515        }
    1616
    1717        function footer() {
    … …  
    2121        function greet() {
    2222                $this->header();
    2323?>
    24 <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>
     24<p><?php _e('Howdy! We&#8217;re about to begin importing all of your Movable Type or Typepad entries into WordPress. To begin, choose a file to upload and click Upload file and import.'); ?></p>
    2525<?php wp_import_upload_form( add_query_arg('step', 1) ); ?>
    2626        <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>
    2727<?php
    … …  
    430430
    431431$mt_import = new MT_Import();
    432432
    433 register_importer('mt', 'Movable Type and Typepad', __('Imports <strong>posts and comments</strong> from your Movable Type or Typepad blog'), array ($mt_import, 'dispatch'));
     433register_importer('mt', 'Movable Type or Typepad', __('Import posts and comments from a Movable Type or Typepad blog'), array ($mt_import, 'dispatch'));
    434434?>

  • wp-admin/import/rss.php

     
    2121        }
    2222
    2323        function greet() {
    24                 echo '<p>'.__('Howdy! This importer allows you to extract posts from any RSS 2.0 file into your blog. This is useful if you want to import your posts from a system that is not handled by a custom import tool. Pick an RSS file to upload and click Import.').'</p>';
     24                echo '<p>'.__('Howdy! This importer allows you to extract posts from a RSS 2.0 file into your blog. This is useful if you want to import your posts from a system that is not handled by a custom import tool. Pick a RSS file to upload and click Import.').'</p>';
    2525                wp_import_upload_form("admin.php?import=rss&amp;step=1");
    2626        }
    2727
    … …  
    167167
    168168$rss_import = new RSS_Import();
    169169
    170 register_importer('rss', 'RSS', __('Import posts from an RSS feed'), array ($rss_import, 'dispatch'));
     170register_importer('rss', 'RSS', __('Import posts from a RSS feed'), array ($rss_import, 'dispatch'));
    171171?>

  • wp-admin/import/textpattern.php

     
    5252
    5353        function greet()
    5454        {
    55                 echo '<p>'.__('Howdy! This importer allows you to extract posts from any Textpattern 4.0.2+ into your blog. This has not been tested on previous versions of Textpattern.  Mileage may vary.').'</p>';
     55                echo '<p>'.__('Howdy! This imports categories, users, posts, comments, and links from any Textpattern 4.0.2+ into this blog.').'</p>';
     56                echo '<p>'.__('This has not been tested on previous versions of Textpattern.  Mileage may vary.').'</p>';
    5657                echo '<p>'.__('Your Textpattern Configuration settings are as follows:').'</p>';
    5758                echo '<form action="admin.php?import=textpattern&amp;step=1" method="post">';
    5859                $this->db_form();
    … …  
    659660}
    660661
    661662$txp_import = new Textpattern_Import();
    662 register_importer('textpattern', 'Textpattern', __('Import posts from a Textpattern Blog'), array ($txp_import, 'dispatch'));
     663register_importer('textpattern', 'Textpattern', __('Import categories, users, posts, comments, and links from a Textpattern blog'), array ($txp_import, 'dispatch'));
    663664?>

  • wp-admin/import/wordpress.php

     
    2525        }
    2626
    2727        function greet() {
    28                 echo '<p>'.__('Howdy! Upload your WordPress eXtended RSS (WXR) file and we&#8217;ll import the posts and comments into this blog.').'</p>';
     28                echo '<p>'.__('Howdy! Upload your WordPress XML export file and we&#8217;ll import the posts, comments, and pages into this blog.').'</p>';
     29                echo '<p>'.__('Choose a WordPress XML file to upload, then click Upload file and import.').'</p>';
    2930                wp_import_upload_form("admin.php?import=wordpress&amp;step=1");
    3031        }
    3132
    … …  
    306307
    307308$wp_import = new WP_Import();
    308309
    309 register_importer('wordpress', 'WordPress', __('Import posts from a WordPress export file'), array ($wp_import, 'dispatch'));
     310register_importer('wordpress', 'WordPress', __('Import posts, comments, and pages from a WordPress XML export file'), array ($wp_import, 'dispatch'));
    310311
    311312?>
     313 No newline at end of file