more localization

git-svn-id: http://svn.automattic.com/wordpress/trunk@1066 1a063a9b-81f0-0310-95a4-ce76da25c4cd

index.php

@@ -48,8 +48,8 @@ require('wp-blog-header.php');
 	</div>
 	
 	<div class="feedback">
-		<?php link_pages('<br />Pages: ', '<br />', 'number'); ?> 
-		<?php comments_popup_link('Comments (0)', 'Comments (1)', 'Comments (%)'); ?> 
+		<?php link_pages('<br />'.$lang->str('pages','',1).' ', '<br />', 'number'); ?> 
+		<?php comments_popup_link($lang->str('comment_count_0','',1), $lang->str('comment_count_1','',1), $lang->str('comment_count_n','',1)); ?> 
 	</div>
 	
 	<!--

wp-comments.php

@@ -5,8 +5,10 @@
 
         if (!empty($post->post_password)) { // if there's a password
             if ($HTTP_COOKIE_VARS['wp-postpass_'.$cookiehash] != $post->post_password) {  // and it doesn't match the cookie
-                echo("<p>Enter your password to view comments.<p>");
-                return;
+?>
+<p><?php $lang->str('comments_password'); ?><p>
+<?php
+				return;
             }
         }
 
@@ -19,13 +21,13 @@
 
 <!-- You can start editing here. -->
 
-<h2 id="comments"><?php comments_number('Comments'); ?> 
+<h2 id="comments"><?php comments_number($lang->str('comments','',1)); ?> 
 <?php if ('open' == $post->comment_status) { ?>
-<a href="#postcomment" title="Leave a comment">&raquo;</a>
+<a href="#postcomment" title="<?php $lang->str('leave_a_comment'); ?>">&raquo;</a>
 <?php } ?>
 </h2>
 <?php if ('open' == $post->ping_status) { ?>
-<p>The <acronym title="Uniform Resource Identifier">URI</acronym> to TrackBack this entry is: <em><?php trackback_url() ?></em></p>
+<p><?php $lang->str('trackback_uri'); ?> <em><?php trackback_url() ?></em></p>
 <?php } ?>
 
 
@@ -34,49 +36,49 @@
 <?php foreach ($comments as $comment) { ?>
 	<li id="comment-<?php comment_ID() ?>">
 	<?php comment_text() ?>
-	<p><cite><?php comment_type(); ?> by <?php comment_author_link() ?> &#8212; <?php comment_date() ?> @ <a href="#comment-<?php comment_ID() ?>"><?php comment_time() ?></a></cite> <?php edit_comment_link('Edit This', ' |'); ?></p>
+	<p><cite><?php comment_type(); ?> <?php $lang->str('by'); ?> <?php comment_author_link() ?> &#8212; <?php comment_date() ?> @ <a href="#comment-<?php comment_ID() ?>"><?php comment_time() ?></a></cite> <?php edit_comment_link($lang->str('edit_this', '', 1), ' |'); ?></p>
 	</li>
 
 <?php } // end for each comment ?>
 </ol>
 <?php } else { // this is displayed if there are no comments so far ?>
-	<p>No comments yet.</p>
+	<p><?php $lang->str('no_comments'); ?></p>
 <?php } ?>
-<p><?php comments_rss_link('<abbr title="Really Simple Syndication">RSS</abbr> feed for comments on this post.'); ?></p>
-<h2 id="postcomment">Leave a Comment</h2>
+<p><?php comments_rss_link($lang->str('comments_rss_post', '', 1)); ?></p>
+<h2 id="postcomment"><?php $lang->str('leave_a_comment'); ?></h2>
 <?php if ('open' == $post->comment_status) { ?>
-<p>Line and paragraph breaks automatic, email address never displayed, <acronym title="Hypertext Markup Language">HTML</acronym> allowed: <code><?php echo allowed_tags(); ?></code></p>
+<p><?php $lang->str('comments_instructions'); ?> <code><?php echo allowed_tags(); ?></code></p>
 
 <form action="<?php echo get_settings('siteurl'); ?>/wp-comments-post.php" method="post" id="commentform">
 	<p>
 	  <input type="text" name="author" id="author" class="textarea" value="<?php echo $comment_author; ?>" size="28" tabindex="1" />
-	   <label for="author">Name</label>
+	   <label for="author"><?php $lang->str('comment_name'); ?></label>
 	<input type="hidden" name="comment_post_ID" value="<?php echo $id; ?>" />
 	<input type="hidden" name="redirect_to" value="<?php echo htmlspecialchars($_SERVER["REQUEST_URI"]); ?>" />
 	</p>
 
 	<p>
 	  <input type="text" name="email" id="email" value="<?php echo $comment_author_email; ?>" size="28" tabindex="2" />
-	   <label for="email">Email</label>
+	   <label for="email"><?php $lang->str('comment_email'); ?></label>
 	</p>
 
 	<p>
 	  <input type="text" name="url" id="url" value="<?php echo $comment_author_url; ?>" size="28" tabindex="3" />
-	   <label for="url"><acronym title="Uniform Resource Identifier">URI</acronym></label>
+	   <label for="url"><?php $lang->str('comment_uri'); ?></label>
 	</p>
 
 	<p>
-	  <label for="comment">Your Comment</label>
+	  <label for="comment"><?php $lang->str('comment_body'); ?></label>
 	<br />
 	  <textarea name="comment" id="comment" cols="70" rows="4" tabindex="4"></textarea>
 	</p>
 
 	<p>
-	  <input name="submit" type="submit" tabindex="5" value="Say it!" />
+	  <input name="submit" type="submit" tabindex="5" value="<?php $lang->str('say_it'); ?>" />
 	</p>
 </form>
 <?php } else { // comments are closed ?>
-<p>Sorry, the comment form is closed at this time.</p>
+<p><?php $lang->str('comments_closed'); ?></p>
 <?php } ?>
 
 <?php // if you delete this the sky will fall on your head

wp-includes/languages/english.php

@@ -15,21 +15,40 @@ $lang->strings = array(
 // Blog template strings
 
 ,"archives" => "Archives:"
+,"by" => "by"
 ,"categories" => "Categories:"
+,"comment_count_0" => "Comments (0)"
+,"comment_count_1" => "Comments (1)"
+,"comment_count_n" => "Comments (%)"
+,"comments" => "Comments"
+,"comments_closed" => "Sorry, the comment form is closed at this time."
+,"comments_instruction" => 'Line and paragraph breaks automatic, e-mail address never displayed, <acronym title="Hypertext Markup Language">HTML</acronym> allowed:'
+,"comment_body" => "Your Comment"
+,"comment_email" => "E-mail"
+,"comment_name" => "Name"
+,"comment_uri" => '<acronym title="Uniform Resource Identifier">URI</acronym>'
+,"comments_password" => "Enter your password to view comments."
 ,"comments_rss_2" => 'Comments <abbr title="Really Simple Syndication">RSS</abbr> 2.0'
 ,"comments_rss_2_title" => "The latest comments to all posts in RSS"
+,"comments_rss_post" => '<abbr title="Really Simple Syndication">RSS</abbr> feed for comments on this post.'
+,"edit_this" => "Edit This"
 ,"filed_under" => "Filed under:"
+,"leave_a_comment" => "Leave a comment"
 ,"login" => "Login"
 ,"meta" => "Meta:"
+,"no_comments" => "No comments yet."
 ,"no_posts_matched" => "Sorry, no posts matched your criteria."
 ,"other" => "Other:"
+,"pages" => "Pages:"
 ,"powered_by" => "Powered by "
 ,"powered_by_title" => "Powered by WordPress, state-of-the-art semantic personal publishing platform"
 ,"register" => "Register"
 ,"rss_2" => '<abbr title="Really Simple Syndication">RSS</abbr> 2.0'
 ,"rss_2_title" => "Syndicate this site using RSS"
+,"say_it" => "Say It!"
 ,"search" => "Search:"
-,"search_buttom" => "search"
+,"search_button" => "search"
+,"trackback_uri" => 'The <acronym title="Uniform Resource Identifier">URI</acronym> to TrackBack this entry is:'
 ,"valid_xhtml" => 'Valid <abbr title="eXtensible HyperText Markup Language">XHTML</abbr>'
 ,"valid_xhtml_title" => "This page validates as XHTML 1.0 Transitional"