WordPress.org
Get WordPress

Make WordPress Core

Changeset 3262


Ignore:
Timestamp:
12/02/2005 10:37:02 PM (21 years ago)
Author:
ryan
Message:

i18n fixes from nbachiyski. #2006

Location:
trunk
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/wp-admin/import.php

    r3061 r3262  
    2828
    2929if (empty ($importers)) {
    30         _e("<p>No importers are available.</p>"); // TODO: make more helpful
     30        echo '<p>'.__('No importers are available.').'</p>'; // TODO: make more helpful
    3131} else {
    3232?>

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

    r3204 r3262  
    2222                $this->header();
    2323?>
    24 <p>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 the process to import all of your Movable Type entries into WordPress. To begin, select a file to upload and click Import.'); ?></p>
    2525<?php wp_import_upload_form( add_query_arg('step', 1) ); ?>
    26 <p>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>
     26        <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
    2828                $this->footer();
    … …  
    179179                                ++ $i;
    180180                                unset ($post_categories);
    181                                 echo "<li>Processing post... ";
     181                                echo '<li>'.__('Processing post...');
    182182
    183183                                // Take the pings out first
    … …  
    271271                                // Let's check to see if it's in already
    272272                                if ($post_id = posts_exists($post_title, '', $post_date)) {
    273                                         echo "Post already imported.";
     273                                        _e('Post already imported.');
    274274                                } else {
    275275                                        $post_author = checkauthor($post_author); //just so that if a post already exists, new users are not created by checkauthor
    … …  
    281281                                                wp_create_categories($post_categories);
    282282                                        }
    283                                         echo " Post imported successfully...";
     283                                        _e(' Post imported successfully...');
    284284                                }
    285285
    … …  
    363363                                                        $commentdata = wp_filter_comment($commentdata);
    364364                                                        wp_insert_comment($commentdata);
    365                                                         echo "Comment added.";
     365                                                        _e('Comment added.');
    366366                                                }
    367367                                        }

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

    r3098 r3262  
    2626       
    2727        function greet() {
    28                 _e("<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>");
     28                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>';
    2929                wp_import_upload_form("admin.php?import=rss&amp;step=1");
    3030        }
    … …  
    109109
    110110                        if ($post_id = post_exists($post_title, $post_content, $post_date)) {
    111                                 echo __('Post already imported');
     111                                _e('Post already imported');
    112112                        } else {
    113113                                $post_id = wp_insert_post($post);
    114114                                if (!$post_id) {
    115                                         echo(__("Couldn't get post ID"));
     115                                        _e("Couldn't get post ID");
    116116                                        return;
    117117                                }
    … …  
    119119                                if (0 != count($categories))
    120120                                        wp_create_categories($categories, $post_id);
    121                                 echo __('Done !');
     121                                _e('Done !');
    122122                        }
    123123                        echo '</li>';
    … …  
    139139                $this->import_posts();
    140140                wp_import_cleanup($file['id']);
    141 
    142                 echo '<h3>All done. <a href="' . get_option('home') . '">Have fun!</a></h3>';
     141               
     142                echo '<h3>';
     143                printf(__('All done. <a href="%s">Have fun!</a>'), get_option('home'));
     144                echo '</h3>';
    143145        }
    144146

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

    r3260 r3262  
    163163                if(is_array($categories))
    164164                {
    165                         echo __('<p>Importing Categories...<br /><br /></p>');
     165                        echo '<p>'.__('Importing Categories...').'<br /><br /></p>';
    166166                        foreach ($categories as $category)
    167167                        {
    … …  
    187187                        // Store category translation for future use
    188188                        add_option('txpcat2wpcat',$txpcat2wpcat);
    189                         echo __('<p>Done! <strong>'.$count.'</strong> categories imported.<br /><br /></p>');
     189                        echo '<p>'.sprintf(__('Done! <strong>%1$s</strong> categories imported.'), $count).'<br /><br /></p>';
    190190                        return true;
    191191                }
    … …  
    204204                if(is_array($users))
    205205                {
    206                         echo __('<p>Importing Users...<br /><br /></p>');
     206                        echo '<p>'.__('Importing Users...').'<br /><br /></p>';
    207207                        foreach($users as $user)
    208208                        {
    … …  
    259259                       
    260260                       
    261                         echo __('<p>Done! <strong>'.$count.'</strong> users imported.<br /><br /></p>');
     261                        echo '<p>'.sprintf(__('Done! <strong>%1$s</strong> users imported.'), $count).'<br /><br /></p>';
    262262                        return true;
    263263                }// End if(is_array($users)
    … …  
    279279                if(is_array($posts))
    280280                {
    281                         echo __('<p>Importing Posts...<br /><br /></p>');
     281                        echo '<p>'.__('Importing Posts...').'<br /><br /></p>';
    282282                        foreach($posts as $post)
    283283                        {
    … …  
    345345                add_option('txpposts2wpposts',$txpposts2wpposts);
    346346               
    347                 echo __('<p>Done! <strong>'.$count.'</strong> posts imported.<br /><br /></p>');
     347                echo '<p>'.sprintf(__('Done! <strong>%1$s</strong> posts imported.'), $count).'<br /><br /></p>';
    348348                return true;   
    349349        }
    … …  
    360360                if(is_array($comments))
    361361                {
    362                         echo __('<p>Importing Comments...<br /><br /></p>');
     362                        echo '<p>'.__('Importing Comments...').'<br /><br /></p>';
    363363                        foreach($comments as $comment)
    364364                        {
    … …  
    412412                       
    413413                       
    414                         echo __('<p>Done! <strong>'.$count.'</strong> comments imported.<br /><br /></p>');
     414                        echo '<p>'.sprintf(__('Done! <strong>%1$s</strong> comments imported.'), $count).'<br /><br /></p>';
    415415                        return true;
    416416                }
    … …  
    552552                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>';
    553553                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>';
     554                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 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="%1$s">Login</a> and change it.'), '/wp-login.php').'</p>';
    555555                echo '<h3>'.__('Preserving Authors').'</h3>';
    556556                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>';
    … …  
    564564                echo '<li>'.__('<a href="http://codex.wordpress.org">The Codex (In other words, the WordPress Bible)</a>').'</li>';
    565565                echo '</ul>';
    566                 echo '<p>'.__('That\'s it! What are you waiting for? Go <a href="/wp-login.php">login</a>!').'</p>';
     566                echo '<p>'.sprintf(__('That\'s it! What are you waiting for? Go <a href="%1$s">login</a>!'), '/wp-login.php').'</p>';
    567567        }
    568568       

  • trunk/wp-admin/inline-uploading.php

    r3251 r3262  
    3939
    4040if ( !current_user_can('edit_post', (int) $attachment) )       
    41         die(printf(__('You are not allowed to delete this attachment. %sGo back</a>'), '<a href="'.basename(__FILE__)."?post=$post&amp;all=$all&amp;action=upload\">") );
     41die(__('You are not allowed to delete this attachment.').' <a href="'.basename(__FILE__)."?post=$post&amp;all=$all&amp;action=upload\">".__('Go back').'</a>');
    4242
    4343wp_delete_attachment($attachment);
    … …  
    5353
    5454if ( isset($file['error']) )
    55         die($file['error'] . '<a href="' . basename(__FILE__) . '?action=upload&post="' . $post . '">Back to Image Uploading</a>');
     55        die($file['error'] . '<a href="' . basename(__FILE__) . '?action=upload&post="' . $post . '">'.__('Back to Image Uploading').'</a>');
    5656
    5757$url = $file['url'];
    … …  
    9595
    9696header("Location: ".basename(__FILE__)."?post=$post&all=$all&action=view&last=true");
    97 die;
     97die();
    9898
    9999case 'upload':
    … …  
    162162        $__using_thumbnail = __('Using Thumbnail');
    163163        $__using_original = __('Using Original');
    164         $__no_thumbnail = __('<del>No Thumbnail</del>');
     164        $__no_thumbnail = '<del>'.__('No Thumbnail').'</del>';
    165165        $__close = __('Close Options');
    166166        $__confirmdelete = __('Delete this file from the server?');
    … …  
    248248
    249249default:
    250 die('This script was not meant to be called directly.');
     250die(__('This script was not meant to be called directly.'));
    251251}
    252252

  • trunk/wp-admin/install.php

    r3232 r3262  
    8080$wpdb->hide_errors();
    8181$installed = $wpdb->get_results("SELECT * FROM $wpdb->users");
    82 if ($installed) die(__('<h1>Already Installed</h1><p>You appear to have already installed WordPress. To reinstall please clear your old database tables first.</p>') . '</body></html>');
     82if ($installed) die('<h1>'.__('Already Installed').'</h1><p>'.__('You appear to have already installed WordPress. To reinstall please clear your old database tables first.').'</p></body></html>');
    8383$wpdb->show_errors();
    8484

  • trunk/wp-admin/post.php

    r3188 r3262  
    346346?>
    347347<div class="wrap">
    348 <?php _e('<h3>WordPress bookmarklet</h3>
    349 <p>Right click on the following link and choose "Add to favorites" to create a posting shortcut.</p>') ?>
     348<?php echo '<h3>'.__('WordPress bookmarklet').'</h3>
     349<p>'.__('Right click on the following link and choose "Add to favorites" to create a posting shortcut.').'</p>'; ?>
    350350<p>
    351351

  • trunk/wp-admin/users.php

    r3102 r3262  
    118118                <?php _e('Delete all posts and links.'); ?></label></li>
    119119                <li><input type="radio" id="delete_option1" name="delete_option" value="reassign" />
    120                 <?php echo sprintf(__('<label for="delete_option1">Attribute all posts and links to:</label> %s'), $user_dropdown); ?></li>
     120                <?php echo '<label for="delete_option1">'.__('Attribute all posts and links to:')."</label> $user_dropdown"; ?></li>
    121121        </ul>
    122122        <input type="hidden" name="action" value="dodelete" />
    … …  
    271271  <ul style="list-style:none;">
    272272        <li><input type="radio" name="action" id="action0" value="delete" /> <label for="action0"><?php _e('Delete checked users.'); ?></label></li>
    273         <li><input type="radio" name="action" id="action1" value="promote" /> <?php echo sprintf(__('<label for="action1">Set the Role of checked users to:</label> %s'), $role_select); ?></li>
     273        <li><input type="radio" name="action" id="action1" value="promote" /> <?php echo '<label for="action1">'.__('Set the Role of checked users to:')."</label> $role_select"; ?></li>
    274274  </ul>
    275275        <p class="submit"><input type="submit" value="<?php _e('Update &raquo;'); ?>" /></p>
    … …  
    279279<div class="wrap">
    280280<h2><?php _e('Add New User') ?></h2>
    281 <?php printf(__('<p>Users can <a href="%s/wp-register.php">register themselves</a> or you can manually create users here.</p>'), get_settings('siteurl')); ?>
     281<?php echo '<p>'.sprintf(__('Users can <a href="%1$s">register themselves</a> or you can manually create users here.'), get_settings('siteurl').'/wp-register.php').'</p>'; ?>
    282282<form action="" method="post" name="adduser" id="adduser">
    283283  <table class="editform" width="100%" cellspacing="2" cellpadding="5">

  • trunk/wp-includes/pluggable-functions.php

    r3214 r3262  
    258258                $notify_message .= sprintf( __('Website: %1$s (IP: %2$s , %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
    259259                $notify_message .= sprintf( __('URI    : %s'), $comment->comment_author_url ) . "\r\n";
    260                 $notify_message .= __('Excerpt: ') . "\r\n" . sprintf( __('[...] %s [...]'), $comment->comment_content ) . "\r\n\r\n";
     260                $notify_message .= __('Excerpt: ') . "\r\n" . sprintf('[...] %s [...]', $comment->comment_content ) . "\r\n\r\n";
    261261                $notify_message .= __('You can see all pingbacks on this post here: ') . "\r\n";
    262262                $subject = sprintf( __('[%1$s] Pingback: "%2$s"'), $blogname, $post->post_title );
Note: See TracChangeset for help on using the changeset viewer.