WordPress.org
Get WordPress

Make WordPress Core

Ticket #19537: 19537.diff

File 19537.diff, 24.1 KB (added by ryan, 13 years ago)

Get the ball rolling

  • wp-activate.php

     
    6363                                <?php
    6464                                echo '<p class="lead-in">';
    6565                                if ( $signup->domain . $signup->path == '' ) {
    66                                         printf( __('Your account has been activated. You may now <a href="%1$s">log in</a> to the site using your chosen username of &#8220;%2$s&#8221;.  Please check your email inbox at %3$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%4$s">reset your password</a>.'), network_site_url( 'wp-login.php', 'login' ), $signup->user_login, $signup->user_email, wp_lostpassword_url() );
     66                                        printf( __('Your account has been activated. You may now <a href="%1$s">log in</a> to the site using your chosen username of &#8220;%2$s&#8221;. Please check your email inbox at %3$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%4$s">reset your password</a>.'), network_site_url( 'wp-login.php', 'login' ), $signup->user_login, $signup->user_email, wp_lostpassword_url() );
    6767                                } else {
    68                                         printf( __('Your site at <a href="%1$s">%2$s</a> is active. You may now log in to your site using your chosen username of &#8220;%3$s&#8221;.  Please check your email inbox at %4$s for your password and login instructions.  If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%5$s">reset your password</a>.'), 'http://' . $signup->domain, $signup->domain, $signup->user_login, $signup->user_email, wp_lostpassword_url() );
     68                                        printf( __('Your site at <a href="%1$s">%2$s</a> is active. You may now log in to your site using your chosen username of &#8220;%3$s&#8221;. Please check your email inbox at %4$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%5$s">reset your password</a>.'), 'http://' . $signup->domain, $signup->domain, $signup->user_login, $signup->user_email, wp_lostpassword_url() );
    6969                                }
    7070                                echo '</p>';
    7171                        } else {

  • wp-admin/users.php

     
    3333        'content' => '<p>' . __('You can customize the display of this screen in a number of ways:') . '</p>' .
    3434                                        '<ul>' .
    3535                                        '<li>' . __('You can hide/display columns based on your needs and decide how many users to list per screen using the Screen Options tab.') . '</li>' .
    36                                         '<li>' . __('You can filter the list of users by User Role using the text links in the upper left to show All, Administrator, Editor, Author, Contributor, or Subscriber. The default view is to show all users.  Unused User Roles are not listed.') . '</li>' .
     36                                        '<li>' . __('You can filter the list of users by User Role using the text links in the upper left to show All, Administrator, Editor, Author, Contributor, or Subscriber. The default view is to show all users. Unused User Roles are not listed.') . '</li>' .
    3737                                        '<li>' . __('You can view all posts made by a user by clicking on the number under the Posts column.') . '</li>' .
    3838                                        '</ul>'
    3939) );

  • wp-admin/admin-ajax.php

     
    970970                // Drafts and auto-drafts are just overwritten by autosave
    971971                if ( 'auto-draft' == $post->post_status || 'draft' == $post->post_status ) {
    972972                        $id = edit_post();
    973                 } else { // Non drafts are not overwritten.  The autosave is stored in a special post revision.
     973                } else { // Non drafts are not overwritten. The autosave is stored in a special post revision.
    974974                        $revision_id = wp_create_post_autosave( $post->ID );
    975975                        if ( is_wp_error($revision_id) )
    976976                                $id = $revision_id;

  • wp-admin/includes/plugin.php

     
    985985        }
    986986
    987987        // If the parent doesn't already have a submenu, add a link to the parent
    988         // as the first item in the submenu.  If the submenu file is the same as the
     988        // as the first item in the submenu. If the submenu file is the same as the
    989989        // parent file someone is trying to link back to the parent manually.  In
    990990        // this case, don't automatically add a link back to avoid duplication.
    991991        if (!isset( $submenu[$parent_slug] ) && $menu_slug != $parent_slug  ) {

  • wp-admin/includes/file.php

     
    240240        // You may define your own function and pass the name in $overrides['upload_error_handler']
    241241        $upload_error_handler = 'wp_handle_upload_error';
    242242
    243         // You may have had one or more 'wp_handle_upload_prefilter' functions error out the file.  Handle that gracefully.
     243        // You may have had one or more 'wp_handle_upload_prefilter' functions error out the file. Handle that gracefully.
    244244        if ( isset( $file['error'] ) && !is_numeric( $file['error'] ) && $file['error'] )
    245245                return $upload_error_handler( $file, $file['error'] );
    246246
    … …  
    364364
    365365/**
    366366 * Handle sideloads, which is the process of retrieving a media item from another server instead of
    367  * a traditional media upload.  This process involves sanitizing the filename, checking extensions
     367 * a traditional media upload. This process involves sanitizing the filename, checking extensions
    368368 * for mime type, and moving the file to the appropriate directory within the uploads directory.
    369369 *
    370370 * @since 2.6.0

  • wp-admin/includes/class-wp-users-list-table.php

     
    209209         * @since 2.1.0
    210210         *
    211211         * @param object $user_object
    212          * @param string $style Optional. Attributes added to the TR element.  Must be sanitized.
     212         * @param string $style Optional. Attributes added to the TR element. Must be sanitized.
    213213         * @param string $role Key for the $wp_roles array.
    214          * @param int $numposts Optional. Post count to display for this user.  Defaults to zero, as in, a new user has made zero posts.
     214         * @param int $numposts Optional. Post count to display for this user. Defaults to zero, as in, a new user has made zero posts.
    215215         * @return string
    216216         */
    217217        function single_row( $user_object, $style = '', $role = '', $numposts = 0 ) {

  • wp-admin/includes/dashboard.php

     
    273273
    274274        echo '</tr><tr>';
    275275        /* TODO: Show status breakdown on hover
    276         if ( $can_edit_pages && !empty($num_pages->publish) ) { // how many pages is not exposed in feeds.  Don't show if !current_user_can
     276        if ( $can_edit_pages && !empty($num_pages->publish) ) { // how many pages is not exposed in feeds. Don't show if !current_user_can
    277277                $post_type_texts[] = '<a href="edit-pages.php">'.sprintf( _n( '%s page', '%s pages', $num_pages->publish ), number_format_i18n( $num_pages->publish ) ).'</a>';
    278278        }
    279279        if ( $can_edit_posts && !empty($num_posts->draft) ) {
    … …  
    11151115        if ( 'POST' == $_SERVER['REQUEST_METHOD'] && isset($_POST['widget-rss'][$number]) ) {
    11161116                $_POST['widget-rss'][$number] = stripslashes_deep( $_POST['widget-rss'][$number] );
    11171117                $widget_options[$widget_id] = wp_widget_rss_process( $_POST['widget-rss'][$number] );
    1118                 // title is optional.  If black, fill it if possible
     1118                // title is optional. If black, fill it if possible
    11191119                if ( !$widget_options[$widget_id]['title'] && isset($_POST['widget-rss'][$number]['title']) ) {
    11201120                        $rss = fetch_feed($widget_options[$widget_id]['url']);
    11211121                        if ( is_wp_error($rss) ) {

  • wp-admin/includes/deprecated.php

     
    133133 * @deprecated Use register_setting()
    134134 * @see register_setting()
    135135 *
    136  * @param string $option_group A settings group name.  Should correspond to a whitelisted option key name.
     136 * @param string $option_group A settings group name. Should correspond to a whitelisted option key name.
    137137 *      Default whitelisted option key names include "general," "discussion," and "reading," among others.
    138138 * @param string $option_name The name of an option to sanitize and save.
    139139 * @param unknown_type $sanitize_callback A callback function that sanitizes the option's value.
    … …  
    870870 * @deprecated Use get_current_screen()->add_help_tab()
    871871 * @see WP_Screen
    872872 *
    873  * @param string    $screen The handle for the screen to add help to.  This is usually the hook name returned by the add_*_page() functions.
     873 * @param string    $screen The handle for the screen to add help to. This is usually the hook name returned by the add_*_page() functions.
    874874 * @param string    $help   The content of an 'Overview' help tab.
    875875 */
    876876function add_contextual_help( $screen, $help ) {

  • wp-admin/includes/image-edit.php

     
    192192        </tbody></table>
    193193        <div class="imgedit-wait" id="imgedit-wait-<?php echo $post_id; ?>"></div>
    194194        <script type="text/javascript">imageEdit.init(<?php echo $post_id; ?>);</script>
    195         <div class="hidden" id="imgedit-leaving-<?php echo $post_id; ?>"><?php _e("There are unsaved changes that will be lost.  'OK' to continue, 'Cancel' to return to the Image Editor."); ?></div>
     195        <div class="hidden" id="imgedit-leaving-<?php echo $post_id; ?>"><?php _e("There are unsaved changes that will be lost. 'OK' to continue, 'Cancel' to return to the Image Editor."); ?></div>
    196196        </div>
    197197<?php
    198198}

  • wp-admin/includes/ms.php

     
    4949 * @since 3.0.0
    5050 *
    5151 * @param int $blog_id Blog ID
    52  * @param bool $drop True if blog's table should be dropped.  Default is false.
     52 * @param bool $drop True if blog's table should be dropped. Default is false.
    5353 * @return void
    5454 */
    5555function wpmu_delete_blog( $blog_id, $drop = false ) {
    … …  
    774774 * Plugins can alter this criteria  using the 'wp_is_large_network' filter.
    775775 *
    776776 * @since 3.3.0
    777  * @param string $using 'sites or 'users'.  Default is 'sites'.
     777 * @param string $using 'sites or 'users'. Default is 'sites'.
    778778 * @return bool True if the network meets the criteria for large. False otherwise.
    779779 */
    780780function wp_is_large_network( $using = 'sites' ) {

  • wp-admin/includes/image.php

     
    205205
    206206        // exif contains a bunch of data we'll probably never need formatted in ways
    207207        // that are difficult to use. We'll normalize it and just extract the fields
    208         // that are likely to be useful.  Fractions and numbers are converted to
     208        // that are likely to be useful. Fractions and numbers are converted to
    209209        // floats, dates to unix timestamps, and everything else to strings.
    210210        $meta = array(
    211211                'aperture' => 0,

  • wp-admin/includes/class-wp-filesystem-direct.php

     
    207207                if ( ! $overwrite && $this->exists($destination) )
    208208                        return false;
    209209
    210                 // try using rename first.  if that fails (for example, source is read only) try copy
     210                // try using rename first. if that fails (for example, source is read only) try copy
    211211                if ( @rename($source, $destination) )
    212212                        return true;
    213213

  • wp-admin/custom-header.php

     
    676676                        $oitar = $width / HEADER_IMAGE_WIDTH;
    677677                        $image = wp_crop_image($file, 0, 0, $width, $height, HEADER_IMAGE_WIDTH, $height / $oitar, false, str_replace(basename($file), 'midsize-'.basename($file), $file));
    678678                        if ( is_wp_error( $image ) )
    679                                 wp_die( __( 'Image could not be processed.  Please go back and try again.' ), __( 'Image Processing Error' ) );
     679                                wp_die( __( 'Image could not be processed. Please go back and try again.' ), __( 'Image Processing Error' ) );
    680680
    681681                        $image = apply_filters('wp_create_file_in_uploads', $image, $id); // For replication
    682682
    … …  
    737737
    738738                $cropped = wp_crop_image( $attachment_id, (int) $_POST['x1'], (int) $_POST['y1'], (int) $_POST['width'], (int) $_POST['height'], HEADER_IMAGE_WIDTH, HEADER_IMAGE_HEIGHT );
    739739                if ( is_wp_error( $cropped ) )
    740                         wp_die( __( 'Image could not be processed.  Please go back and try again.' ), __( 'Image Processing Error' ) );
     740                        wp_die( __( 'Image could not be processed. Please go back and try again.' ), __( 'Image Processing Error' ) );
    741741
    742742                $cropped = apply_filters('wp_create_file_in_uploads', $cropped, $attachment_id); // For replication
    743743

  • wp-admin/user-new.php

     
    251251        if ( $do_both )
    252252                echo '<h3 id="add-existing-user">' . __('Add Existing User') . '</h3>';
    253253        if ( !is_super_admin() ) {
    254                 _e( 'Enter the email address of an existing user on this network to invite them to this site.  That person will be sent an email asking them to confirm the invite.' );
     254                _e( 'Enter the email address of an existing user on this network to invite them to this site. That person will be sent an email asking them to confirm the invite.' );
    255255                $label = __('E-mail');
    256256        } else {
    257                 _e( 'Enter the email address or username of an existing user on this network to invite them to this site.  That person will be sent an email asking them to confirm the invite.' );
     257                _e( 'Enter the email address or username of an existing user on this network to invite them to this site. That person will be sent an email asking them to confirm the invite.' );
    258258                $label = __('E-mail or Username');
    259259        }
    260260?>

  • wp-admin/options-general.php

     
    151151
    152152$check_zone_info = true;
    153153
    154 // Remove old Etc mappings.  Fallback to gmt_offset.
     154// Remove old Etc mappings. Fallback to gmt_offset.
    155155if ( false !== strpos($tzstring,'Etc/GMT') )
    156156        $tzstring = '';
    157157

  • wp-admin/edit-form-advanced.php

     
    8787if ( $autosave && mysql2date( 'U', $autosave->post_modified_gmt, false ) > mysql2date( 'U', $post->post_modified_gmt, false ) ) {
    8888        foreach ( _wp_post_revision_fields() as $autosave_field => $_autosave_field ) {
    8989                if ( normalize_whitespace( $autosave->$autosave_field ) != normalize_whitespace( $post->$autosave_field ) ) {
    90                         $notice = sprintf( __( 'There is an autosave of this post that is more recent than the version below.  <a href="%s">View the autosave</a>' ), get_edit_post_link( $autosave->ID ) );
     90                        $notice = sprintf( __( 'There is an autosave of this post that is more recent than the version below. <a href="%s">View the autosave</a>' ), get_edit_post_link( $autosave->ID ) );
    9191                        break;
    9292                }
    9393        }

  • wp-admin/options-discussion.php

     
    164164
    165165<h3><?php _e('Avatars'); ?></h3>
    166166
    167 <p><?php _e('An avatar is an image that follows you from weblog to weblog appearing beside your name when you comment on avatar enabled sites.  Here you can enable the display of avatars for people who comment on your site.'); ?></p>
     167<p><?php _e('An avatar is an image that follows you from weblog to weblog appearing beside your name when you comment on avatar enabled sites. Here you can enable the display of avatars for people who comment on your site.'); ?></p>
    168168
    169169<?php // the above would be a good place to link to codex documentation on the gravatar functions, for putting it in themes. anything like that? ?>
    170170

  • wp-admin/plugins.php

     
    355355        if ( isset( $_GET['main'] ) )
    356356                $errmsg = __( 'You cannot delete a plugin while it is active on the main site.' );
    357357        elseif ( isset($_GET['charsout']) )
    358                 $errmsg = sprintf(__('The plugin generated %d characters of <strong>unexpected output</strong> during activation.  If you notice &#8220;headers already sent&#8221; messages, problems with syndication feeds or other issues, try deactivating or removing this plugin.'), $_GET['charsout']);
     358                $errmsg = sprintf(__('The plugin generated %d characters of <strong>unexpected output</strong> during activation. If you notice &#8220;headers already sent&#8221; messages, problems with syndication feeds or other issues, try deactivating or removing this plugin.'), $_GET['charsout']);
    359359        else
    360360                $errmsg = __('Plugin could not be activated because it triggered a <strong>fatal error</strong>.');
    361361        ?>

  • wp-admin/upgrade.php

     
    2727else
    2828        $step = 0;
    2929
    30 // Do it.  No output.
     30// Do it. No output.
    3131if ( 'upgrade_db' === $step ) {
    3232        wp_upgrade();
    3333        die( '0' );

  • wp-admin/install.php

     
    207207                        $error = true;
    208208                } elseif ( ! is_email( $admin_email ) ) {
    209209                        // TODO: poka-yoke
    210                         display_setup_form( __( 'that isn&#8217;t a valid e-mail address.  E-mail addresses look like: <code>username@example.com</code>' ) );
     210                        display_setup_form( __( 'that isn&#8217;t a valid e-mail address. E-mail addresses look like: <code>username@example.com</code>' ) );
    211211                        $error = true;
    212212                }
    213213

  • wp-admin/update-core.php

     
    3636        $mysql_version  = $wpdb->db_version();
    3737        $show_buttons = true;
    3838        if ( 'development' == $update->response ) {
    39                 $message = __('You are using a development version of WordPress.  You can update to the latest nightly build automatically or download the nightly build and install it manually:');
     39                $message = __('You are using a development version of WordPress. You can update to the latest nightly build automatically or download the nightly build and install it manually:');
    4040                $download = __('Download nightly build');
    4141        } else {
    4242                if ( $current ) {
    … …  
    317317                echo "
    318318        <tr class='active'>
    319319                <th scope='row' class='check-column'><input type='checkbox' name='checked[]' value='" . esc_attr($stylesheet) . "' /></th>
    320                 <td class='plugin-title'><img src='$screenshot' width='64' height='64' style='float:left; padding: 0 5px 5px' /><strong>{$theme_data->Name}</strong>" .  sprintf(__('You have version %1$s installed. Update to %2$s.'), $theme_data->Version, $theme_data->update['new_version']) . "</td>
     320                <td class='plugin-title'><img src='$screenshot' width='64' height='64' style='float:left; padding: 0 5px 5px' /><strong>{$theme_data->Name}</strong>" . sprintf(__('You have version %1$s installed. Update to %2$s.'), $theme_data->Version, $theme_data->update['new_version']) . "</td>
    321321        </tr>";
    322322        }
    323323?>

  • wp-admin/import.php

     
    2020        'id'      => 'overview',
    2121        'title'   => __('Overview'),
    2222        'content' => '<p>' . __('This screen lists links to plugins to import data from blogging/content management platforms. Choose the platform you want to import from, and click Install Now when you are prompted in the popup window. If your platform is not listed, click the link to search the plugin directory for other importer plugins to see if there is one for your platform.') . '</p>' .
    23                 '<p>' . __('In previous versions of WordPress, all importers were built-in.  They have been turned into plugins since most people only use them once or infrequently.') . '</p>',
     23                '<p>' . __('In previous versions of WordPress, all importers were built-in. They have been turned into plugins since most people only use them once or infrequently.') . '</p>',
    2424) );
    2525
    2626

  • wp-admin/options-writing.php

     
    3232if ( is_multisite() ) {
    3333        $post_email_help = '<p>' . __('Due to security issues, you cannot use Post By Email on Multisite Installs.') . '</p>';
    3434} else {
    35         $post_email_help = '<p>' . __('Post via email settings allow you to send your WordPress install an email with the content of your post.  You must set up a secret e-mail account with POP3 access to use this, and any mail received at this address will be posted, so it&#8217;s a good idea to keep this address very secret.') . '</p>';
     35        $post_email_help = '<p>' . __('Post via email settings allow you to send your WordPress install an email with the content of your post. You must set up a secret e-mail account with POP3 access to use this, and any mail received at this address will be posted, so it&#8217;s a good idea to keep this address very secret.') . '</p>';
    3636}
    3737
    3838get_current_screen()->add_help_tab( array(

  • wp-admin/plugin-editor.php

     
    236236                <?php endif; ?>
    237237<?php if ( is_writeable($real_file) ) : ?>
    238238        <?php if ( in_array( $file, (array) get_option( 'active_plugins', array() ) ) ) { ?>
    239                 <p><?php _e('<strong>Warning:</strong> Making changes to active plugins is not recommended.  If your changes cause a fatal error, the plugin will be automatically deactivated.'); ?></p>
     239                <p><?php _e('<strong>Warning:</strong> Making changes to active plugins is not recommended. If your changes cause a fatal error, the plugin will be automatically deactivated.'); ?></p>
    240240        <?php } ?>
    241241        <p class="submit">
    242242        <?php

  • wp-admin/themes.php

     
    7676?>
    7777
    7878<?php if ( ! validate_current_theme() ) : ?>
    79 <div id="message1" class="updated"><p><?php _e('The active theme is broken.  Reverting to the default theme.'); ?></p></div>
     79<div id="message1" class="updated"><p><?php _e('The active theme is broken. Reverting to the default theme.'); ?></p></div>
    8080<?php elseif ( isset($_GET['activated']) ) :
    8181                if ( isset($wp_registered_sidebars) && count( (array) $wp_registered_sidebars ) && current_user_can('edit_theme_options') ) { ?>
    8282<div id="message2" class="updated"><p><?php printf( __('New theme activated. This theme supports widgets, please visit the <a href="%s">widgets settings</a> screen to configure them.'), admin_url( 'widgets.php' ) ); ?></p></div><?php