WP Merge to rev 4661

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@828 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 9 insertions, 21 deletions

diff --git a/wp-admin/moderation.php b/wp-admin/moderation.php
index 8999741..22bcf26 100644
--- a/wp-admin/moderation.php
+++ b/wp-admin/moderation.php
@@ -72,32 +72,20 @@ if ( isset($_GET['deleted']) || isset($_GET['approved']) || isset($_GET['ignored
 	$ignored  = (int) $_GET['ignored'];
 	$spam     = (int) $_GET['spam'];
 	if ($approved) {
-		if ('1' == $approved) {
-			echo __("1 comment approved") . " <br/>\n";
-		} else {
-		 echo sprintf(__("%s comments approved <br />"), $approved) . "\n";
-		}
+		printf(__ngettext('%s comment approved', '%s comments approved', $approved), $approved);
+		echo "<br/>\n";
 	}
 	if ($deleted) {
-		if ('1' == $deleted) {
-			echo __("1 comment deleted") . " <br/>\n";
-		} else {
-			echo sprintf(__("%s comments deleted"), $deleted) . " <br/>\n";
-		}
+		printf(__ngettext('%s comment deleted', '%s comments deleted', $deleted), $deleted);
+		echo "<br/>\n";
 	}
 	if ($spam) {
-		if ('1' == $spam) {
-			echo __("1 comment marked as spam") . " <br/>\n";
-		} else {
-			echo sprintf(__("%s comments marked as spam"), $spam) . " <br/>\n";
-		}
+		printf(__ngettext('%s comment marked as spam', '%s comments marked as spam', $spam), $spam);
+		echo "<br/>\n";
 	}
 	if ($ignored) {
-		if ('1' == $ignored) {
-			echo __("1 comment unchanged") . " <br/>\n";
-		} else {
-			echo sprintf(__("%s comments unchanged"), $ignored) . " <br/>\n";
-		}
+		printf(__ngettext('%s comment unchanged', '%s comments unchanged', $ignored), $ignored);
+		echo "<br/>\n";
 	}
 	echo "</p></div>\n";
 }
@@ -135,7 +123,7 @@ $i = 0;
 <?php comment_text() ?>
 <p><?php comment_date('M j, g:i A'); ?> &#8212; [ <?php
 echo '<a href="comment.php?action=editcomment&amp;c='.$comment->comment_ID.'">' . __('Edit') . '</a> | ';
-echo " <a href=\"post.php?action=deletecomment&amp;p=".$comment->comment_post_ID."&amp;comment=".$comment->comment_ID."\" onclick=\"return deleteSomething( 'comment', $comment->comment_ID, '" . js_escape(sprintf(__("You are about to delete this comment by &quot;%s&quot;.\\n&quot;Cancel&quot; to stop, &quot;OK&quot; to delete."), $comment->comment_author )) . "', theCommentList );\">" . __('Delete ') . "</a> | "; ?>
+echo " <a href=\"post.php?action=deletecomment&amp;p=".$comment->comment_post_ID."&amp;comment=".$comment->comment_ID."\" onclick=\"return deleteSomething( 'comment', $comment->comment_ID, '" . js_escape(sprintf(__("You are about to delete this comment by &quot;%s&quot;.\n&quot;Cancel&quot; to stop, &quot;OK&quot; to delete."), $comment->comment_author )) . "', theCommentList );\">" . __('Delete ') . "</a> | "; ?>
 <?php
 $post = get_post($comment->comment_post_ID);
 $post_title = wp_specialchars( $post->post_title, 'double' );