Changeset 14407 for trunk/wp-admin/ms-sites.php

Timestamp:

05/03/2010 08:37:07 PM (14 years ago)

Author:

nbachiyski

Message:

Differentiate spam strings by subject: comments, sites, and users. Props dimadin. Fixes #13199

File:

• trunk/wp-admin/ms-sites.php (modified) (8 diffs)

trunk/wp-admin/ms-sites.php

@@ -114 +114 @@
                         </tr>
                         <tr class="form-field">
-                            <th scope="row"><?php _e( 'Registered') ?></th>
+                            <th scope="row"><?php echo _x( 'Registered', 'site' ) ?></th>
                             <td><input name="blog[registered]" type="text" id="blog_registered" value="<?php echo esc_attr( $details->registered ) ?>" size="40" /></td>
                         </tr>
@@ -125 +125 @@
                         if ( ! $is_main_site ) {
                             $radio_fields['archived'] = __( 'Archived' );
-                            $radio_fields['spam']     = __( 'Spam' );
+                            $radio_fields['spam']     = _x( 'Spam', 'site' );
                             $radio_fields['deleted']  = __( 'Deleted' );
                         }
@@ -415 +415 @@
                 <option value="-1" selected="selected"><?php _e( 'Bulk Actions' ); ?></option>
                 <option value="delete"><?php _e( 'Delete' ); ?></option>
-                <option value="spam"><?php _e( 'Mark as Spam' ); ?></option>
-                <option value="notspam"><?php _e( 'Not Spam' ); ?></option>
+                <option value="spam"><?php echo _x( 'Mark as Spam', 'site' ); ?></option>
+                <option value="notspam"><?php echo _x( 'Not Spam', 'site' ); ?></option>
             </select>
             <input type="submit" value="<?php esc_attr_e( 'Apply' ); ?>" name="doaction" id="doaction" class="button-secondary action" />
@@ -449 +449 @@
             'blogname'     => $blogname_columns,
             'lastupdated'  => __( 'Last Updated'),
-            'registered'   => __( 'Registered' ),
+            'registered'   => _x( 'Registered', 'site' ),
             'users'        => __( 'Users' )
         );
@@ -490 +490 @@
             <tbody id="the-site-list" class="list:site">
             <?php
-            $status_list = array( 'archived' => array( 'site-archived', __( 'Archived' ) ), 'spam' => array( 'site-spammed', __( 'Spam' ) ), 'deleted' => array( 'site-deleted', __( 'Deleted' ) ), 'mature' => array( 'site-mature', __( 'Mature' ) ) );
+            $status_list = array( 'archived' => array( 'site-archived', __( 'Archived' ) ), 'spam' => array( 'site-spammed', _x( 'Spam', 'site' ) ), 'deleted' => array( 'site-deleted', __( 'Deleted' ) ), 'mature' => array( 'site-mature', __( 'Mature' ) ) );
             if ( $blog_list ) {
                 $class = '';
@@ -535 +535 @@
                                     <?php
                                     if ( 'list' != $mode )
-                                        echo '<p>' . sprintf( _x( '%1$s &#8211; <em>%2$s', '%1$s: site name. %2$s: site tagline.' ), get_blog_option( $blog['blog_id'], 'blogname' ), get_blog_option( $blog['blog_id'], 'blogdescription ' ) ) . '</em></p>';
+                                        echo '<p>' . sprintf( _x( '%1$s &#8211; <em>%2$s</em>', '%1$s: site name. %2$s: site tagline.' ), get_blog_option( $blog['blog_id'], 'blogname' ), get_blog_option( $blog['blog_id'], 'blogdescription ' ) ) . '</p>';
 
                                     // Preordered.
@@ -558 +558 @@
                                             $actions['unarchive']   = '<span class="archive"><a href="' . esc_url( admin_url( 'ms-edit.php?action=confirm&amp;action2=unarchiveblog&amp;id=' .  $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( 'You are about to unarchive the site %s.' ), $blogname ) ) ) ) . '">' . __( 'Unarchive' ) . '</a></span>';
                                         else
-                                            $actions['archive'] = '<span class="archive"><a href="' . esc_url( admin_url( 'ms-edit.php?action=confirm&amp;action2=archiveblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( 'You are about to archive the site %s.' ), $blogname ) ) ) ) . '">' . __( 'Archive' ) . '</a></span>';
+                                            $actions['archive'] = '<span class="archive"><a href="' . esc_url( admin_url( 'ms-edit.php?action=confirm&amp;action2=archiveblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( 'You are about to archive the site %s.' ), $blogname ) ) ) ) . '">' . _x( 'Archive', 'verb; site' ) . '</a></span>';
 
                                         if ( get_blog_status( $blog['blog_id'], 'spam' ) == '1' )
-                                            $actions['unspam']  = '<span class="spam"><a href="' . esc_url( admin_url( 'ms-edit.php?action=confirm&amp;action2=unspamblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( 'You are about to unspam the site %s.' ), $blogname ) ) ) ) . '">' . __( 'Not Spam' ) . '</a></span>';
+                                            $actions['unspam']  = '<span class="spam"><a href="' . esc_url( admin_url( 'ms-edit.php?action=confirm&amp;action2=unspamblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( 'You are about to unspam the site %s.' ), $blogname ) ) ) ) . '">' . _x( 'Not Spam', 'site' ) . '</a></span>';
                                         else
-                                            $actions['spam']    = '<span class="spam"><a href="' . esc_url( admin_url( 'ms-edit.php?action=confirm&amp;action2=spamblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( 'You are about to mark the site %s as spam.' ), $blogname ) ) ) ) . '">' . __( 'Spam' ) . '</a></span>';
+                                            $actions['spam']    = '<span class="spam"><a href="' . esc_url( admin_url( 'ms-edit.php?action=confirm&amp;action2=spamblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( 'You are about to mark the site %s as spam.' ), $blogname ) ) ) ) . '">' . _x( 'Spam', 'site' ) . '</a></span>';
 
                                         $actions['delete']  = '<span class="delete"><a href="' . esc_url( admin_url( 'ms-edit.php?action=confirm&amp;action2=deleteblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( 'You are about to delete the site %s.' ), $blogname ) ) ) ) . '">' . __( 'Delete' ) . '</a></span>';
@@ -666 +666 @@
                 <option value="-1" selected="selected"><?php _e( 'Bulk Actions' ); ?></option>
                 <option value="delete"><?php _e( 'Delete' ); ?></option>
-                <option value="spam"><?php _e( 'Mark as Spam' ); ?></option>
-                <option value="notspam"><?php _e( 'Not Spam' ); ?></option>
+                <option value="spam"><?php echo _x( 'Mark as Spam', 'site' ); ?></option>
+                <option value="notspam"><?php echo _x( 'Not Spam', 'site' ); ?></option>
             </select>
             <input type="submit" value="<?php esc_attr_e( 'Apply' ); ?>" name="doaction2" id="doaction2" class="button-secondary action" />