Ticket #2509: akismet.php.3.diff

Index: akismet.php
===================================================================
--- akismet.php (revision 6972)
+++ akismet.php (working copy)
@@ -8,6 +8,8 @@
 Author URI: http://photomatt.net/
 */
 
+load_plugin_textdomain('akismet', 'wp-content/plugins/akismet');
+
 add_action('admin_menu', 'ksd_config_page');
 
 if ( ! function_exists('wp_nonce_field') ) {
@@ -25,7 +27,7 @@
 function ksd_config_page() {
        global $wpdb;
        if ( function_exists('add_submenu_page') )
-               add_submenu_page('plugins.php', __('Akismet Configuration'), __('Akismet Configuration'), 'manage_options', 'akismet-key-config', 'akismet_conf');
+               add_submenu_page('plugins.php', __('Akismet Configuration', 'akismet'), __('Akismet Configuration', 'akismet'), 'manage_options', __FILE__, 'akismet_conf');
 }
 
 function akismet_conf() {
@@ -46,18 +48,18 @@
 ?>
 
 <div class="wrap">
-<h2><?php _e('Akismet Configuration'); ?></h2>
+<h2><?php _e('Akismet Configuration', 'akismet'); ?></h2>
 <div class="narrow">
-       <p><?php printf(__('For many people, <a href="%1$s">Akismet</a> will greatly reduce or even completely eliminate the comment and trackback spam you get on your site. If one does happen to get through, simply mark it as "spam" on the moderation screen and Akismet will learn from the mistakes. If you don\'t have a WordPress.com account yet, you can get one at <a href="%2$s">WordPress.com</a>.'), 'http://akismet.com/', 'http://wordpress.com/api-keys/'); ?></p>
+       <p><?php printf(__('For many people, <a href="%1$s">Akismet</a> will greatly reduce or even completely eliminate the comment and trackback spam you get on your site. If one does happen to get through, simply mark it as "spam" on the moderation screen and Akismet will learn from the mistakes. If you don\'t have a WordPress.com account yet, you can get one at <a href="%2$s">WordPress.com</a>.', 'akismet'), 'http://akismet.com/', 'http://wordpress.com/api-keys/'); ?></p>
 
 <form action="" method="post" id="akismet-conf" style="margin: auto; width: 400px; ">
 <?php akismet_nonce_field($akismet_nonce) ?>
-<h3><label for="key"><?php _e('WordPress.com API Key'); ?></label></h3>
+<h3><label for="key"><?php _e('WordPress.com API Key', 'akismet'); ?></label></h3>
 <?php if ( $invalid_key ) { ?>
-       <p style="padding: .5em; background-color: #f33; color: #fff; font-weight: bold;"><?php _e('Your key appears invalid. Double-check it.'); ?></p>
+       <p style="padding: .5em; background-color: #f33; color: #fff; font-weight: bold;"><?php _e('Your key appears invalid. Double-check it.', 'akismet'); ?></p>
 <?php } ?>
-<p><input id="key" name="key" type="text" size="15" maxlength="12" value="<?php echo get_option('wordpress_api_key'); ?>" style="font-family: 'Courier New', Courier, mono; font-size: 1.5em;" /> (<?php _e('<a href="http://faq.wordpress.com/2005/10/19/api-key/">What is this?</a>'); ?>)</p>
-       <p class="submit"><input type="submit" name="submit" value="<?php _e('Update API Key &raquo;'); ?>" /></p>
+<p><input id="key" name="key" type="text" size="15" maxlength="12" value="<?php echo get_option('wordpress_api_key'); ?>" style="font-family: 'Courier New', Courier, mono; font-size: 1.5em;" /> (<?php _e('<a href="http://faq.wordpress.com/2005/10/19/api-key/">What is this?</a>', 'akismet'); ?>)</p>
+       <p class="submit"><input type="submit" name="submit" value="<?php _e('Update API Key &raquo;', 'akismet'); ?>" /></p>
 </form>
 </div>
 </div>
@@ -77,7 +79,7 @@
 if ( !get_option('wordpress_api_key') && !isset($_POST['submit']) ) {
        function akismet_warning() {
                echo "
-               <div id='akismet-warning' class='updated fade-ff0000'><p><strong>".__('Akismet is not active.')."</strong> ".sprintf(__('You must <a href="%1$s">enter your WordPress.com API key</a> for it to work.'), "plugins.php?page=akismet-key-config")."</p></div>
+               <div id='akismet-warning' class='updated fade-ff0000'><p><strong>".__('Akismet is not active.', 'akismet')."</strong> ".sprintf(__('You must <a href="%1$s">enter your WordPress.com API key</a> for it to work.', 'akismet'), "plugins.php?page=akismet-key-config")."</p></div>
                <style type='text/css'>
                #adminmenu { margin-bottom: 5em; }
                #akismet-warning { position: absolute; top: 7em; }
@@ -201,11 +203,11 @@
 
 function ksd_manage_page() {
        global $wpdb, $submenu;
-       $count = sprintf(__('Akismet Spam (%s)'), ksd_spam_count());
+       $count = sprintf(__('Akismet Spam (%s)', 'akismet'), ksd_spam_count());
        if ( isset( $submenu['edit-comments.php'] ) )
-               add_submenu_page('edit-comments.php', __('Akismet Spam'), $count, 'moderate_comments', 'akismet-admin', 'ksd_caught' );
+               add_submenu_page('edit-comments.php', __('Akismet Spam', 'akismet'), $count, 'moderate_comments', 'akismet-admin', 'ksd_caught' );
        elseif ( function_exists('add_management_page') )
-               add_management_page(__('Akismet Spam'), $count, 'moderate_comments', 'akismet-admin', 'ksd_caught');
+               add_management_page(__('Akismet Spam', 'akismet'), $count, 'moderate_comments', 'akismet-admin', 'ksd_caught');
 }
 
 function ksd_caught() {
@@ -213,7 +215,7 @@
        akismet_recheck_queue();
        if (isset($_POST['submit']) && 'recover' == $_POST['action'] && ! empty($_POST['not_spam'])) {
                if ( function_exists('current_user_can') && !current_user_can('moderate_comments') )
-                       die(__('You do not have sufficient permission to moderate comments.'));
+                       die(__('You do not have sufficient permission to moderate comments.', 'akismet'));
                
                $i = 0;
                foreach ($_POST['not_spam'] as $comment):
@@ -225,48 +227,48 @@
                        ksd_submit_nonspam_comment($comment);
                        ++$i;
                endforeach;
-               echo '<div class="updated"><p>' . sprintf(__('%1$s comments recovered.'), $i) . "</p></div>";
+               echo '<div class="updated"><p>' . sprintf(__('%1$s comments recovered.', 'akismet'), $i) . "</p></div>";
        }
        if ('delete' == $_POST['action']) {
                if ( function_exists('current_user_can') && !current_user_can('moderate_comments') )
-                       die(__('You do not have sufficient permission to moderate comments.'));
+                       die(__('You do not have sufficient permission to moderate comments.', 'akismet'));
 
                $delete_time = addslashes( $_POST['display_time'] );
                $nuked = $wpdb->query( "DELETE FROM $wpdb->comments WHERE comment_approved = 'spam' AND '$delete_time' > comment_date_gmt" );
                if (isset($nuked)) {
                        echo '<div class="updated"><p>';
                        if ($nuked) {
-                               _e('All spam deleted.');
+                               _e('All spam deleted.', 'akismet');
                        }
                        echo "</p></div>";
                }
        }
 ?>
 <div class="wrap">
-<h2><?php _e('Caught Spam') ?></h2>
+<h2><?php _e('Caught Spam', 'akismet') ?></h2>
 <?php
 $count = get_option('akismet_spam_count');
 if ( $count ) {
 ?>
-<p><?php printf(__('Akismet has caught <strong>%1$s spam</strong> for you since you first installed it.'), number_format($count) ); ?></p>
+<p><?php printf(__('Akismet has caught <strong>%1$s spam</strong> for you since you first installed it.', 'akismet'), number_format($count) ); ?></p>
 <?php
 }
 $spam_count = ksd_spam_count();
 if (0 == $spam_count) {
-       echo '<p>'.__('You have no spam currently in the queue. Must be your lucky day. :)').'</p>';
+       echo '<p>'.__('You have no spam currently in the queue. Must be your lucky day. :)', 'akismet').'</p>';
        echo '</div>';
 } else {
-       echo '<p>'.__('You can delete all of the spam from your database with a single click. This operation cannot be undone, so you may wish to check to ensure that no legitimate comments got through first. Spam is automatically deleted after 15 days, so don&#8217;t sweat it.').'</p>';
+       echo '<p>'.__('You can delete all of the spam from your database with a single click. This operation cannot be undone, so you may wish to check to ensure that no legitimate comments got through first. Spam is automatically deleted after 15 days, so don&#8217;t sweat it.', 'akismet').'</p>';
 ?>
 <form method="post" action="">
 <input type="hidden" name="action" value="delete" />
-<?php printf(__('There are currently %1$s comments identified as spam.'), $spam_count); ?>&nbsp; &nbsp; <input type="submit" name="Submit" value="<?php _e('Delete all'); ?>" />
+<?php printf(__('There are currently %1$s comments identified as spam.', 'akismet'), $spam_count); ?>&nbsp; &nbsp; <input type="submit" name="Submit" value="<?php _e('Delete all', 'akismet'); ?>" />
 <input type="hidden" name="display_time" value="<?php echo current_time('mysql', 1); ?>" />
 </form>
 </div>
 <div class="wrap">
-<h2><?php _e('Latest Spam'); ?></h2>
-<?php echo '<p>'.__('These are the latest comments identified as spam by Akismet. If you see any mistakes, simply mark the comment as "not spam" and Akismet will learn from the submission. If you wish to recover a comment from spam, simply select the comment, and click Not Spam. After 15 days we clean out the junk for you.').'</p>'; ?>
+<h2><?php _e('Latest Spam', 'akismet'); ?></h2>
+<?php echo '<p>'.__('These are the latest comments identified as spam by Akismet. If you see any mistakes, simply mark the comment as "not spam" and Akismet will learn from the submission. If you wish to recover a comment from spam, simply select the comment, and click Not Spam. After 15 days we clean out the junk for you.', 'akismet').'</p>'; ?>
 <?php
 if ( isset( $_GET['apage'] ) )
        $page = (int) $_GET['apage'];
@@ -334,7 +336,7 @@
 
 <p><label for="spam-<?php echo $comment->comment_ID; ?>">
 <input type="checkbox" id="spam-<?php echo $comment->comment_ID; ?>" name="not_spam[]" value="<?php echo $comment->comment_ID; ?>" />
-<?php _e('Not Spam') ?></label> &#8212; <?php comment_date('M j, g:i A');  ?> &#8212; [ 
+<?php _e('Not Spam', 'akismet') ?></label> &#8212; <?php comment_date('M j, g:i A');  ?> &#8212; [ 
 <?php
 $post = get_post($comment->comment_post_ID);
 $post_title = wp_specialchars( $post->post_title, 'double' );
@@ -349,13 +351,13 @@
 ?>
 </ul>
 <p class="submit"> 
-<input type="submit" name="submit" value="<?php _e('De-spam marked comments &raquo;'); ?>" />
+<input type="submit" name="submit" value="<?php _e('De-spam marked comments &raquo;', 'akismet'); ?>" />
 </p>
-<p><?php _e('Comments you de-spam will be submitted to Akismet as mistakes so it can learn and get better.'); ?></p>
+<p><?php _e('Comments you de-spam will be submitted to Akismet as mistakes so it can learn and get better.', 'akismet'); ?></p>
 </form>
 <form method="post" action="">
 <p><input type="hidden" name="action" value="delete" />
-<?php printf(__('There are currently %1$s comments identified as spam.'), $spam_count); ?>&nbsp; &nbsp; <input type="submit" name="Submit" value="<?php _e('Delete all'); ?>" />
+<?php printf(__('There are currently %1$s comments identified as spam.', 'akismet'), $spam_count); ?>&nbsp; &nbsp; <input type="submit" name="Submit" value="<?php _e('Delete all', 'akismet'); ?>" />
 <input type="hidden" name="display_time" value="<?php echo current_time('mysql', 1); ?>" /></p>
 </form>
 </div>
@@ -370,13 +372,13 @@
        if ( !$count )
                return;
        $path = plugin_basename(__FILE__);
-       echo '<h3>'.__('Spam').'</h3>';
+       echo '<h3>' . __('Spam', 'akismet') . '</h3>';
        global $submenu;
        if ( isset( $submenu['edit-comments.php'] ) )
                $link = 'edit-comments.php';
        else
                $link = 'edit.php';
-       echo '<p>'.sprintf(__('<a href="%1$s">Akismet</a> has protected your site from <a href="%2$s">%3$s spam comments</a>.'), 'http://akismet.com/', "$link?page=akismet-admin", number_format($count) ).'</p>';
+       echo '<p>' . sprintf(__('<a href="%1$s">Akismet</a> has protected your site from <a href="%2$s">%3$s spam comments</a>.', 'akismet'), 'http://akismet.com/', "$link?page=akismet-admin", number_format($count) ) . '</p>';
 }
 
 add_action('activity_box_end', 'akismet_stats');
@@ -387,11 +389,11 @@
                extract($args);
                $options = get_option('widget_akismet');
                $count = number_format(get_option('akismet_spam_count'));
-               $text = __('%d spam comments have been blocked by <a href="http://akismet.com">Akismet</a>.');
+               $text = __('%d spam comments have been blocked by <a href="http://akismet.com">Akismet</a>.', 'akismet');
                ?>
                        <?php echo $before_widget; ?>
                                <?php echo $before_title . $options['title'] . $after_title; ?>
-                               <div id="akismetwrap"><div id="akismetstats"><a id="aka" href="http://akismet.com" title=""><div id="akismet1"><span id="akismetcount"><?php echo $count; ?></span> <span id="akismetsc"><?php _e('spam comments') ?></span></div> <div id="akismet2"><span id="akismetbb"><?php _e('blocked by') ?></span><br /><span id="akismeta">Akismet</span></div></a></div></div>
+                               <div id="akismetwrap"><div id="akismetstats"><a id="aka" href="http://akismet.com" title=""><div id="akismet1"><span id="akismetcount"><?php echo $count; ?></span> <span id="akismetsc"><?php _e('spam comments', 'akismet') ?></span></div> <div id="akismet2"><span id="akismetbb"><?php _e('blocked by', 'akismet') ?></span><br /><span id="akismeta"><?php _e('Akismet', 'akismet') ?></span></div></a></div></div>
                        <?php echo $after_widget; ?>
        <?php
        }
@@ -475,8 +477,8 @@
        <?php
        }
 
-       register_sidebar_widget('Akismet', 'widget_akismet', null, 'akismet');
-       register_widget_control('Akismet', 'widget_akismet_control', 300, 75, 'akismet');
+       register_sidebar_widget(array('Akismet', 'akismet'), 'widget_akismet', null, 'akismet');
+       register_widget_control(array('Akismet', 'akismet'), 'widget_akismet_control', 300, 75, 'akismet');
        if ( is_active_widget('widget_akismet') )
                add_action('wp_head', 'widget_akismet_style');
        endif;
@@ -499,7 +501,7 @@
 <?php
 $count = number_format(get_option('akismet_spam_count'));
 ?>
-<div id="akismetwrap"><div id="akismetstats"><a id="aka" href="http://akismet.com" title=""><div id="akismet1"><span id="akismetcount"><?php echo $count; ?></span> <span id="akismetsc"><?php _e('spam comments') ?></span></div> <div id="akismet2"><span id="akismetbb"><?php _e('blocked by') ?></span><br /><span id="akismeta">Akismet</span></div></a></div></div>
+<div id="akismetwrap"><div id="akismetstats"><a id="aka" href="http://akismet.com" title=""><div id="akismet1"><span id="akismetcount"><?php echo $count; ?></span> <span id="akismetsc"><?php _e('spam comments', 'akismet') ?></span></div> <div id="akismet2"><span id="akismetbb"><?php _e('blocked by', 'akismet') ?></span><br /><span id="akismeta"><?php _e('Akismet', 'akismet') ?></span></div></a></div></div>
 <?php
 }
 
@@ -510,7 +512,7 @@
                        $link = 'edit-comments.php';
                else
                        $link = 'edit.php';
-               $button = "<a href='$link?page=akismet-admin&amp;recheckqueue=true&amp;noheader=true' style='display: block; width: 100px; position: absolute; right: 7%; padding: 5px; font-size: 14px; text-decoration: underline; background: #fff; border: 1px solid #ccc;'>Recheck Queue for Spam</a>";
+               $button = "<a href='$link?page=akismet-admin&amp;recheckqueue=true&amp;noheader=true' style='display: block; width: 100px; position: absolute; right: 7%; padding: 5px; font-size: 14px; text-decoration: underline; background: #fff; border: 1px solid #ccc;'>" . <?php _e('Recheck Queue for Spam', 'akismet') ?> . "</a>";
                $page = str_replace( '<div class="wrap">', '<div class="wrap">' . $button, $page );
                return $page;
        }