Wordpress 3.0

[autoinstalls/wordpress.git] / wp-includes / theme-compat / comments.php

diff --git a/wp-content/themes/default/comments.php b/wp-includes/theme-compat/comments.php
similarity index 50%
rename from wp-content/themes/default/comments.php
rename to wp-includes/theme-compat/comments.php
index 186a73ca16e2fbc75695c724a5df59cf9c272539..b095d51c75be0082583083fbfc99eb26aa355cbc 100644 (file)
--- a/wp-content/themes/default/comments.php
+++ b/wp-includes/theme-compat/comments.php
@@ -1,15 +1,20 @@
 <?php
 /**
  * @package WordPress
- * @subpackage Default_Theme
+ * @subpackage Theme_Compat
+ * @deprecated 3.0
+ * 
+ * This file is here for Backwards compatibility with old themes and will be removed in a future version
+ * 
  */
+_deprecated_file( sprintf( __( 'Theme without %1$s' ), basename(__FILE__) ), '3.0', null, sprintf( __('Please include a %1$s template in your theme.'), basename(__FILE__) ) );
 
 // Do not delete these lines
        if (!empty($_SERVER['SCRIPT_FILENAME']) && 'comments.php' == basename($_SERVER['SCRIPT_FILENAME']))
                die ('Please do not load this page directly. Thanks!');
-
+       
        if ( post_password_required() ) { ?>
-               <p class="nocomments">This post is password protected. Enter the password to view comments.</p>
+               <p class="nocomments"><?php _e('This post is password protected. Enter the password to view comments.'); ?></p> 
        <?php
                return;
        }
@@ -18,7 +23,8 @@
 <!-- You can start editing here. -->
 
 <?php if ( have_comments() ) : ?>
-       <h3 id="comments"><?php comments_number('No Responses', 'One Response', '% Responses' );?> to &#8220;<?php the_title(); ?>&#8221;</h3>
+       <h3 id="comments"><?php printf( _n( 'One Response to %2$s', '%1$s Responses to %2$s', get_comments_number() ),
+                                                                       number_format_i18n( get_comments_number() ), '&#8220;' . get_the_title() . '&#8221;' ); ?></h3>
 
        <div class="navigation">
                <div class="alignleft"><?php previous_comments_link() ?></div>
@@ -26,7 +32,7 @@
        </div>
 
        <ol class="commentlist">
-       <?php wp_list_comments(); ?>
+       <?php wp_list_comments();?>
        </ol>
 
        <div class="navigation">
@@ -40,7 +46,7 @@
 
         <?php else : // comments are closed ?>
                <!-- If comments are closed. -->
-               <p class="nocomments">Comments are closed.</p>
+               <p class="nocomments"><?php _e('Comments are closed.'); ?></p>
 
        <?php endif; ?>
 <?php endif; ?>
@@ -50,41 +56,41 @@
 
 <div id="respond">
 
-<h3><?php comment_form_title( 'Leave a Reply', 'Leave a Reply to %s' ); ?></h3>
+<h3><?php comment_form_title( __('Leave a Reply'), __('Leave a Reply to %s' ) ); ?></h3>
 
-<div class="cancel-comment-reply">
-       <small><?php cancel_comment_reply_link(); ?></small>
-</div>
+<div id="cancel-comment-reply"> 
+       <small><?php cancel_comment_reply_link() ?></small>
+</div> 
 
 <?php if ( get_option('comment_registration') && !is_user_logged_in() ) : ?>
-<p>You must be <a href="<?php echo wp_login_url( get_permalink() ); ?>">logged in</a> to post a comment.</p>
+<p><?php printf(__('You must be <a href="%s">logged in</a> to post a comment.'), wp_login_url( get_permalink() )); ?></p>
 <?php else : ?>
 
 <form action="<?php echo get_option('siteurl'); ?>/wp-comments-post.php" method="post" id="commentform">
 
 <?php if ( is_user_logged_in() ) : ?>
 
-<p>Logged in as <a href="<?php echo get_option('siteurl'); ?>/wp-admin/profile.php"><?php echo $user_identity; ?></a>. <a href="<?php echo wp_logout_url(get_permalink()); ?>" title="Log out of this account">Log out &raquo;</a></p>
+<p><?php printf(__('Logged in as <a href="%1$s">%2$s</a>.'), get_option('siteurl') . '/wp-admin/profile.php', $user_identity); ?> <a href="<?php echo wp_logout_url(get_permalink()); ?>" title="<?php _e('Log out of this account'); ?>"><?php _e('Log out &raquo;'); ?></a></p>
 
 <?php else : ?>
 
 <p><input type="text" name="author" id="author" value="<?php echo esc_attr($comment_author); ?>" size="22" tabindex="1" <?php if ($req) echo "aria-required='true'"; ?> />
-<label for="author"><small>Name <?php if ($req) echo "(required)"; ?></small></label></p>
+<label for="author"><small><?php _e('Name'); ?> <?php if ($req) _e('(required)'); ?></small></label></p>
 
 <p><input type="text" name="email" id="email" value="<?php echo esc_attr($comment_author_email); ?>" size="22" tabindex="2" <?php if ($req) echo "aria-required='true'"; ?> />
-<label for="email"><small>Mail (will not be published) <?php if ($req) echo "(required)"; ?></small></label></p>
+<label for="email"><small><?php _e('Mail (will not be published)'); ?> <?php if ($req) _e('(required)'); ?></small></label></p>
 
-<p><input type="text" name="url" id="url" value="<?php echo esc_attr($comment_author_url); ?>" size="22" tabindex="3" />
-<label for="url"><small>Website</small></label></p>
+<p><input type="text" name="url" id="url" value="<?php echo  esc_attr($comment_author_url); ?>" size="22" tabindex="3" />
+<label for="url"><small><?php _e('Website'); ?></small></label></p>
 
 <?php endif; ?>
 
-<!--<p><small><strong>XHTML:</strong> You can use these tags: <code><?php echo allowed_tags(); ?></code></small></p>-->
+<!--<p><small><?php printf(__('<strong>XHTML:</strong> You can use these tags: <code>%s</code>'), allowed_tags()); ?></small></p>-->
 
 <p><textarea name="comment" id="comment" cols="58" rows="10" tabindex="4"></textarea></p>
 
-<p><input name="submit" type="submit" id="submit" tabindex="5" value="Submit Comment" />
-<?php comment_id_fields(); ?>
+<p><input name="submit" type="submit" id="submit" tabindex="5" value="<?php _e('Submit Comment'); ?>" />
+<?php comment_id_fields(); ?> 
 </p>
 <?php do_action('comment_form', $post->ID); ?>