Make WordPress Core

Ticket #8714: 8714.7.diff

File 8714.7.diff, 12.5 KB (added by SergeyBiryukov, 11 years ago)
  • wp-admin/edit.php

     
    110110
    111111                                if ( $post_del->post_type == 'attachment' ) {
    112112                                        if ( ! wp_delete_attachment($post_id) )
    113                                                 wp_die( __('Error in deleting...') );
     113                                                wp_die( __('Error in deleting…') );
    114114                                } else {
    115115                                        if ( !wp_delete_post($post_id) )
    116                                                 wp_die( __('Error in deleting...') );
     116                                                wp_die( __('Error in deleting…') );
    117117                                }
    118118                                $deleted++;
    119119                        }
  • wp-admin/includes/class-wp-comments-list-table.php

     
    456456                        $author_url = '';
    457457                $author_url_display = preg_replace( '|http://(www\.)?|i', '', $author_url );
    458458                if ( strlen( $author_url_display ) > 50 )
    459                         $author_url_display = substr( $author_url_display, 0, 49 ) . '...';
     459                        $author_url_display = substr( $author_url_display, 0, 49 ) . '…';
    460460
    461461                echo "<strong>"; comment_author(); echo '</strong><br />';
    462462                if ( !empty( $author_url ) )
  • wp-admin/includes/dashboard.php

     
    827827                        $publisher = "<strong>$publisher</strong>";
    828828
    829829                $content = $item->get_content();
    830                 $content = wp_html_excerpt($content, 50) . ' ...';
     830                $content = wp_html_excerpt($content, 50) . ' &hellip;';
    831831
    832832                if ( $link )
    833833                        /* translators: incoming links feed, %1$s is other person, %3$s is content */
  • wp-admin/includes/misc.php

     
    224224        $short_url = str_replace( 'www.', '', $short_url );
    225225        $short_url = untrailingslashit( $short_url );
    226226        if ( strlen( $short_url ) > 35 )
    227                 $short_url = substr( $short_url, 0, 32 ) . '...';
     227                $short_url = substr( $short_url, 0, 32 ) . '&hellip;';
    228228        return $short_url;
    229229}
    230230
  • wp-admin/includes/upgrade.php

     
    184184
    185185<blockquote>Hi there! I'm a bike messenger by day, aspiring actor by night, and this is my blog. I live in Los Angeles, have a great dog named Jack, and I like pi&#241;a coladas. (And gettin' caught in the rain.)</blockquote>
    186186
    187 ...or something like this:
     187&hellip;or something like this:
    188188
    189189<blockquote>The XYZ Doohickey Company was founded in 1971, and has been providing quality doohickeys to the public ever since. Located in Gotham City, XYZ employs over 2,000 people and does all kinds of awesome things for the Gotham community.</blockquote>
    190190
  • wp-admin/press-this.php

     
    586586                        </div>
    587587                </div>
    588588
    589                 <div id="waiting" style="display: none"><span class="spinner"></span> <span><?php esc_html_e( 'Loading...' ); ?></span></div>
     589                <div id="waiting" style="display: none"><span class="spinner"></span> <span><?php esc_html_e( 'Loading&hellip;' ); ?></span></div>
    590590
    591591                <div id="extra-fields" style="display: none"></div>
    592592
  • wp-admin/theme-editor.php

     
    112112                        $functions = wp_doc_link_parse( $content );
    113113
    114114                        $docs_select = '<select name="docs-list" id="docs-list">';
    115                         $docs_select .= '<option value="">' . esc_attr__( 'Function Name...' ) . '</option>';
     115                        $docs_select .= '<option value="">' . esc_attr__( 'Function Name&hellip;' ) . '</option>';
    116116                        foreach ( $functions as $function ) {
    117117                                $docs_select .= '<option value="' . esc_attr( urlencode( $function ) ) . '">' . htmlspecialchars( $function ) . '()</option>';
    118118                        }
  • wp-admin/upload.php

     
    9999                                        wp_die( __( 'You are not allowed to move this post to the trash.' ) );
    100100
    101101                                if ( !wp_trash_post( $post_id ) )
    102                                         wp_die( __( 'Error in moving to trash...' ) );
     102                                        wp_die( __( 'Error in moving to trash&hellip;' ) );
    103103                        }
    104104                        $location = add_query_arg( array( 'trashed' => count( $post_ids ), 'ids' => join( ',', $post_ids ) ), $location );
    105105                        break;
     
    111111                                        wp_die( __( 'You are not allowed to move this post out of the trash.' ) );
    112112
    113113                                if ( !wp_untrash_post( $post_id ) )
    114                                         wp_die( __( 'Error in restoring from trash...' ) );
     114                                        wp_die( __( 'Error in restoring from trash&hellip;' ) );
    115115                        }
    116116                        $location = add_query_arg( 'untrashed', count( $post_ids ), $location );
    117117                        break;
     
    123123                                        wp_die( __( 'You are not allowed to delete this post.' ) );
    124124
    125125                                if ( !wp_delete_attachment( $post_id_del ) )
    126                                         wp_die( __( 'Error in deleting...' ) );
     126                                        wp_die( __( 'Error in deleting&hellip;' ) );
    127127                        }
    128128                        $location = add_query_arg( 'deleted', count( $post_ids ), $location );
    129129                        break;
  • wp-includes/class-wp-xmlrpc-server.php

     
    54125412
    54135413                                // prevent really long link text
    54145414                                if ( strlen($context[1]) > 100 )
    5415                                         $context[1] = substr($context[1], 0, 100) . '...';
     5415                                        $context[1] = substr($context[1], 0, 100) . '&hellip;';
    54165416
    54175417                                $marker = '<wpcontext>'.$context[1].'</wpcontext>';    // set up our marker
    54185418                                $excerpt= str_replace($context[0], $marker, $excerpt); // swap out the link for our marker
     
    54305430
    54315431                $pagelinkedfrom = str_replace('&', '&amp;', $pagelinkedfrom);
    54325432
    5433                 $context = '[...] ' . esc_html( $excerpt ) . ' [...]';
     5433                $context = '[&hellip;] ' . esc_html( $excerpt ) . ' [&hellip;]';
    54345434                $pagelinkedfrom = $wpdb->escape( $pagelinkedfrom );
    54355435
    54365436                $comment_post_ID = (int) $post_ID;
  • wp-includes/comment-template.php

     
    419419        for ($i=0; $i<$k; $i++) {
    420420                $excerpt .= $blah[$i] . ' ';
    421421        }
    422         $excerpt .= ($use_dotdotdot) ? '...' : '';
     422        $excerpt .= ($use_dotdotdot) ? '&hellip;' : '';
    423423        return apply_filters('get_comment_excerpt', $excerpt);
    424424}
    425425
  • wp-includes/comment.php

     
    17561756        else
    17571757                $excerpt = apply_filters('the_excerpt', $post->post_excerpt);
    17581758        $excerpt = str_replace(']]>', ']]&gt;', $excerpt);
    1759         $excerpt = wp_html_excerpt($excerpt, 252) . '...';
     1759        $excerpt = wp_html_excerpt($excerpt, 252) . '&hellip;';
    17601760
    17611761        $post_title = apply_filters('the_title', $post->post_title, $post->ID);
    17621762        $post_title = strip_tags($post_title);
  • wp-includes/deprecated.php

     
    17041704 * @param int $cut Optional. Amount of words to keep for the content.
    17051705 * @param int $encode_html Optional. How to encode the content.
    17061706 */
    1707 function the_content_rss($more_link_text='(more...)', $stripteaser=0, $more_file='', $cut = 0, $encode_html = 0) {
     1707function the_content_rss($more_link_text='(more&hellip;)', $stripteaser=0, $more_file='', $cut = 0, $encode_html = 0) {
    17081708        _deprecated_function( __FUNCTION__, '2.9', 'the_content_feed' );
    17091709        $content = get_the_content($more_link_text, $stripteaser, $more_file);
    17101710        $content = apply_filters('the_content_rss', $content);
     
    17311731                /** @todo Check performance, might be faster to use array slice instead. */
    17321732                for ( $i=0; $i<$k; $i++ )
    17331733                        $excerpt .= $blah[$i].' ';
    1734                 $excerpt .= ($use_dotdotdot) ? '...' : '';
     1734                $excerpt .= ($use_dotdotdot) ? '&hellip;' : '';
    17351735                $content = $excerpt;
    17361736        }
    17371737        $content = str_replace(']]>', ']]&gt;', $content);
  • wp-includes/formatting.php

     
    21312131 * Generates an excerpt from the content, if needed.
    21322132 *
    21332133 * The excerpt word amount will be 55 words and if the amount is greater than
    2134  * that, then the string ' [...]' will be appended to the excerpt. If the string
     2134 * that, then the string ' [&hellip;]' will be appended to the excerpt. If the string
    21352135 * is less than 55 words, then the content will be returned as is.
    21362136 *
    21372137 * The 55 word limit can be modified by plugins/themes using the excerpt_length filter
    2138  * The ' [...]' string can be modified by plugins/themes using the excerpt_more filter
     2138 * The ' [&hellip;]' string can be modified by plugins/themes using the excerpt_more filter
    21392139 *
    21402140 * @since 1.5.0
    21412141 *
     
    21522152                $text = apply_filters('the_content', $text);
    21532153                $text = str_replace(']]>', ']]&gt;', $text);
    21542154                $excerpt_length = apply_filters('excerpt_length', 55);
    2155                 $excerpt_more = apply_filters('excerpt_more', ' ' . '[...]');
     2155                $excerpt_more = apply_filters('excerpt_more', ' ' . '[&hellip;]');
    21562156                $text = wp_trim_words( $text, $excerpt_length, $excerpt_more );
    21572157        }
    21582158        return apply_filters('wp_trim_excerpt', $text, $raw_excerpt);
  • wp-includes/post-template.php

     
    183183        $post = get_post();
    184184
    185185        if ( null === $more_link_text )
    186                 $more_link_text = __( '(more...)' );
     186                $more_link_text = __( '(more&hellip;)' );
    187187
    188188        $output = '';
    189189        $hasTeaser = false;
  • wp-includes/post.php

     
    33723372                // form an excerpt
    33733373                $excerpt = strip_tags($post_excerpt ? $post_excerpt : $post_content);
    33743374
    3375                 if (strlen($excerpt) > 255) {
    3376                         $excerpt = substr($excerpt,0,252) . '...';
     3375                if ( strlen( $excerpt ) > 255 ) {
     3376                        $excerpt = substr( $excerpt, 0, 252 ) . '&hellip;';
    33773377                }
    33783378
    33793379                $trackback_urls = explode(',', $tb_list);
  • wp-login.php

     
    248248        $message = apply_filters('retrieve_password_message', $message, $key);
    249249
    250250        if ( $message && !wp_mail($user_email, $title, $message) )
    251                 wp_die( __('The e-mail could not be sent.') . "<br />\n" . __('Possible reason: your host may have disabled the mail() function...') );
     251                wp_die( __('The e-mail could not be sent.') . "<br />\n" . __('Possible reason: your host may have disabled the mail() function&hellip;') );
    252252
    253253        return true;
    254254}
     
    338338        $user_pass = wp_generate_password( 12, false);
    339339        $user_id = wp_create_user( $sanitized_user_login, $user_pass, $user_email );
    340340        if ( ! $user_id ) {
    341                 $errors->add( 'registerfail', sprintf( __( '<strong>ERROR</strong>: Couldn&#8217;t register you... please contact the <a href="mailto:%s">webmaster</a> !' ), get_option( 'admin_email' ) ) );
     341                $errors->add( 'registerfail', sprintf( __( '<strong>ERROR</strong>: Couldn&#8217;t register you&hellip; please contact the <a href="mailto:%s">webmaster</a> !' ), get_option( 'admin_email' ) ) );
    342342                return $errors;
    343343        }
    344344
  • wp-trackback.php

     
    8787        if ( !pings_open($tb_id) )
    8888                trackback_response(1, 'Sorry, trackbacks are closed for this item.');
    8989
    90         $title =  wp_html_excerpt( $title, 250 ).'...';
    91         $excerpt = wp_html_excerpt( $excerpt, 252 ).'...';
     90        $title =  wp_html_excerpt( $title, 250 ) . '&hellip;';
     91        $excerpt = wp_html_excerpt( $excerpt, 252 ) . '&hellip;';
    9292
    9393        $comment_post_ID = (int) $tb_id;
    9494        $comment_author = $blog_name;