Changeset 3260

Show
Ignore:
Timestamp:
12/02/05 17:42:12 (3 years ago)
Author:
ryan
Message:

i18n updates from nbachiyski. #2006

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/wp-admin/import/blogger.php

    r3259 r3260  
    342342                $form.= $body; 
    343343                $form.= "</div><script type='text/javascript'>forms=document.getElementsByTagName('form');for(i=0;i<forms.length;i++){if(forms[i].action.search('{$blog_opt}')){forms[i].submit();break;}}</script>"; 
    344                 $output.= "<p><strong>$blog_opt</strong> in progress, please wait...</p>\n"; 
     344                $output.= '<p>'.sprintf('<strong>%s</strong> in progress, please wait...', $blog_opt)."</p>\n"; 
    345345            } else { 
    346346                $output.= "<p>$blog_opt</p>\n"; 

  • trunk/wp-admin/import/textpattern.php

    r3253 r3260  
    4343        echo '<div class="wrap">'; 
    4444        echo '<h2>'.__('Import Textpattern').'</h2>'; 
    45         echo '<p>'.__('Steps may take a few minutes depending on the size of your database. Please be patient.</p>'); 
     45        echo '<p>'.__('Steps may take a few minutes depending on the size of your database. Please be patient.').'</p>'; 
    4646    } 
    4747 
    …… 
    5353    function greet()  
    5454    { 
    55         _e('<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>'); 
    56         _e('<p>Your Textpattern Configuration settings are as follows:</p>'); 
    57         _e('<form action="admin.php?import=textpattern&amp;step=1" method="post">'); 
     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>'; 
     56        echo '<p>'.__('Your Textpattern Configuration settings are as follows:').'</p>'; 
     57        echo '<form action="admin.php?import=textpattern&amp;step=1" method="post">'; 
    5858        $this->db_form(); 
    59         _e('<input type="submit" name="submit" value="Import Categories" />'); 
    60         _e('</form>'); 
     59        echo '<input type="submit" name="submit" value="Import Categories" />'; 
     60        echo '</form>'; 
    6161    } 
    6262 
    …… 
    428428        if(is_array($links)) 
    429429        { 
    430             echo __('<p>Importing Links...<br /><br /></p>'); 
     430            echo '<p>'.__('Importing Links...').'<br /><br /></p>'; 
    431431            foreach($links as $link) 
    432432            { 
    …… 
    463463            } 
    464464            add_option('txplinks2wplinks',$txplinks2wplinks); 
    465             echo __('<p>Done! <strong>'.$count.'</strong> Links imported.<br /><br /></p>'); 
     465            echo '<p>'; 
     466            printf(__('Done! <strong>%s</strong> Links imported'), $count); 
     467            echo '<br /><br /></p>'; 
    466468            return true; 
    467469        } 
    …… 
    479481         
    480482             
    481         _e('<form action="admin.php?import=textpattern&amp;step=2" method="post">'); 
    482         _e('<input type="submit" name="submit" value="Import Users" />'); 
    483         _e('</form>'); 
     483        echo '<form action="admin.php?import=textpattern&amp;step=2" method="post">'; 
     484        printf('<input type="submit" name="submit" value="%s" />', __('Import Users')); 
     485        echo '</form>'; 
    484486 
    485487    } 
    …… 
    491493        $this->users2wp($users); 
    492494         
    493         _e('<form action="admin.php?import=textpattern&amp;step=3" method="post">'); 
    494         _e('<input type="submit" name="submit" value="Import Posts" />'); 
    495         _e('</form>'); 
     495        echo '<form action="admin.php?import=textpattern&amp;step=3" method="post">'; 
     496        printf('<input type="submit" name="submit" value="%s" />', __('Import Posts')); 
     497        echo '</form>'; 
    496498    } 
    497499     
    …… 
    502504        $this->posts2wp($posts); 
    503505         
    504         _e('<form action="admin.php?import=textpattern&amp;step=4" method="post">'); 
    505         _e('<input type="submit" name="submit" value="Import Comments" />'); 
    506         _e('</form>'); 
     506        echo '<form action="admin.php?import=textpattern&amp;step=4" method="post">'; 
     507        printf('<input type="submit" name="submit" value="%s" />', __('Import Comments')); 
     508        echo '</form>'; 
    507509    } 
    508510     
    …… 
    513515        $this->comments2wp($comments); 
    514516         
    515         _e('<form action="admin.php?import=textpattern&amp;step=5" method="post">'); 
    516         _e('<input type="submit" name="submit" value="Import Links" />'); 
    517         _e('</form>'); 
     517        echo '<form action="admin.php?import=textpattern&amp;step=5" method="post">'; 
     518        printf('<input type="submit" name="submit" value="%s" />', __('Import Links')); 
     519        echo '</form>'; 
    518520    } 
    519521     
    …… 
    525527        add_option('txp_links', $links); 
    526528         
    527         _e('<form action="admin.php?import=textpattern&amp;step=6" method="post">'); 
    528         _e('<input type="submit" name="submit" value="Finish" />'); 
    529         _e('</form>'); 
     529        echo '<form action="admin.php?import=textpattern&amp;step=6" method="post">'; 
     530        printf('<input type="submit" name="submit" value="%s" />', __('Finish')); 
     531        echo '</form>'; 
    530532    } 
    531533     
    …… 
    548550    function tips() 
    549551    { 
    550         echo __('<p>Welcome to WordPress.  We hope (and expect!) that you will find this platform incredibly rewarding!  As a new WordPress user coming from Textpattern, there are some things that we would like to point out.  Hopefully, they will help your transition go as smoothly as possible.</p>'); 
    551         echo __('<h3>Users</h3>'); 
    552         echo __('<p>You have already setup WordPress and have been assigned an administrative login and password.  Forget it.  You didn\'t have that login in Textpattern, 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 Textpattern 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="/wp-login.php">Login</a> and change it.</p>'); 
    553         echo __('<h3>Preserving Authors</h3>'); 
    554         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>'); 
    555         echo __('<h3>Textile</h3>'); 
    556         echo __('<p>Also, since you\'re coming from Textpattern, 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>'); 
    557         echo __('<h3>WordPress Resources</h3>'); 
    558         echo __('<p>Finally, there are numerous WordPress resources around the internet.  Some of them are:</p>'); 
    559         echo __('<ul>'); 
    560         echo __('<li><a href="http://www.wordpress.org">The official WordPress site</a></li>'); 
    561         echo __('<li><a href="http://wordpress.org/support/">The WordPress support forums</li>'); 
    562         echo __('<li><a href="http://codex.wordpress.org">The Codex (In other words, the WordPress Bible)</a></li>'); 
    563         echo __('</ul>'); 
    564         echo __('<p>That\'s it! What are you waiting for? Go <a href="/wp-login.php">login</a>!</p>'); 
     552        echo '<p>'.__('Welcome to WordPress.  We hope (and expect!) that you will find this platform incredibly rewarding!  As a new WordPress user coming from Textpattern, there are some things that we would like to point out.  Hopefully, they will help your transition go as smoothly as possible.').'</p>'; 
     553        echo '<h3>'.__('Users').'</h3>'; 
     554        echo '<p>'.__('You have already setup WordPress and have been assigned an administrative login and password.  Forget it.  You didn\'t have that login in Textpattern, 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 Textpattern 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="/wp-login.php">Login</a> and change it.').'</p>'; 
     555        echo '<h3>'.__('Preserving Authors').'</h3>'; 
     556        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>'; 
     557        echo '<h3>'.__('Textile').'</h3>'; 
     558        echo '<p>'.__('Also, since you\'re coming from Textpattern, 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>'; 
     559        echo '<h3>'.__('WordPress Resources').'</h3>'; 
     560        echo '<p>'.__('Finally, there are numerous WordPress resources around the internet.  Some of them are:').'</p>'; 
     561        echo '<ul>'; 
     562        echo '<li>'.__('<a href="http://www.wordpress.org">The official WordPress site</a>').'</li>'; 
     563        echo '<li>'.__('<a href="http://wordpress.org/support/">The WordPress support forums').'</li>'; 
     564        echo '<li>'.__('<a href="http://codex.wordpress.org">The Codex (In other words, the WordPress Bible)</a>').'</li>'; 
     565        echo '</ul>'; 
     566        echo '<p>'.__('That\'s it! What are you waiting for? Go <a href="/wp-login.php">login</a>!').'</p>'; 
    565567    } 
    566568     
    567569    function db_form() 
    568570    { 
    569         _e('<ul>'); 
    570         _e('<li><label for="dbuser">Textpattern Database User:</label> <input type="text" name="dbuser" /></li>'); 
    571         _e('<li><label for="dbpass">Textpattern Database Password:</label> <input type="password" name="dbpass" /></li>'); 
    572         _e('<li><label for="dbname">Textpattern Database Name:</label> <input type="text" name="dbname" /></li>'); 
    573         _e('<li><label for="dbhost">Textpattern Database Host:</label> <input type="text" name="dbhost" value="localhost" /></li>'); 
    574         _e('<li><label for="dbprefix">Textpattern Table prefix (if any)t:</label> <input type="text" name="dbprefix" /></li>'); 
    575         _e('</ul>');        
     571        echo '<ul>'; 
     572        printf('<li><label for="dbuser">%s</label> <input type="text" name="dbuser" /></li>', __('Textpattern Database User:')); 
     573        printf('<li><label for="dbpass">%s</label> <input type="password" name="dbpass" /></li>', __('Textpattern Database Password:')); 
     574        printf('<li><label for="dbname">%s</label> <input type="text" name="dbname" /></li>', __('Textpattern Database Name:')); 
     575        printf('<li><label for="dbhost">%s</label> <input type="text" name="dbhost" value="localhost" /></li>', __('Textpattern Database Host:')); 
     576        printf('<li><label for="dbprefix">%s</label> <input type="text" name="dbprefix" /></li>', __('Textpattern Table prefix (if any):')); 
     577        echo '</ul>'; 
    576578    } 
    577579