WordPress.org

Make WordPress Core

Changeset 24207


Ignore:
Timestamp:
05/08/13 21:27:31 (22 months ago)
Author:
SergeyBiryukov
Message:

Use ellipsis instead of three dots. props tjsingleton, jordie23, wojtek.szkutnik, DrewAPicture, SergeyBiryukov. see #8714.

Location:
trunk
Files:
16 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/edit.php

    r23747 r24207  
    118118                if ( $post_del->post_type == 'attachment' ) { 
    119119                    if ( ! wp_delete_attachment($post_id) ) 
    120                         wp_die( __('Error in deleting...') ); 
     120                        wp_die( __('Error in deleting.') ); 
    121121                } else { 
    122122                    if ( !wp_delete_post($post_id) ) 
    123                         wp_die( __('Error in deleting...') ); 
     123                        wp_die( __('Error in deleting.') ); 
    124124                } 
    125125                $deleted++; 
  • trunk/wp-admin/includes/class-wp-comments-list-table.php

    r24123 r24207  
    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 />'; 
  • trunk/wp-admin/includes/dashboard.php

    r23606 r24207  
    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 ) 
  • trunk/wp-admin/includes/misc.php

    r24042 r24207  
    224224    $short_url = untrailingslashit( $short_url ); 
    225225    if ( strlen( $short_url ) > 35 ) 
    226         $short_url = substr( $short_url, 0, 32 ) . '...'; 
     226        $short_url = substr( $short_url, 0, 32 ) . '&hellip;'; 
    227227    return $short_url; 
    228228} 
  • trunk/wp-admin/press-this.php

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

    r23580 r24207  
    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>'; 
  • trunk/wp-admin/upload.php

    r23567 r24207  
    100100 
    101101                if ( !wp_trash_post( $post_id ) ) 
    102                     wp_die( __( 'Error in moving to trash...' ) ); 
     102                    wp_die( __( 'Error in moving to trash.' ) ); 
    103103            } 
    104104            $location = add_query_arg( array( 'trashed' => count( $post_ids ), 'ids' => join( ',', $post_ids ) ), $location ); 
     
    112112 
    113113                if ( !wp_untrash_post( $post_id ) ) 
    114                     wp_die( __( 'Error in restoring from trash...' ) ); 
     114                    wp_die( __( 'Error in restoring from trash.' ) ); 
    115115            } 
    116116            $location = add_query_arg( 'untrashed', count( $post_ids ), $location ); 
     
    124124 
    125125                if ( !wp_delete_attachment( $post_id_del ) ) 
    126                     wp_die( __( 'Error in deleting...' ) ); 
     126                    wp_die( __( 'Error in deleting.' ) ); 
    127127            } 
    128128            $location = add_query_arg( 'deleted', count( $post_ids ), $location ); 
  • trunk/wp-includes/class-wp-xmlrpc-server.php

    r23952 r24207  
    54235423                // prevent really long link text 
    54245424                if ( strlen($context[1]) > 100 ) 
    5425                     $context[1] = substr($context[1], 0, 100) . '...'; 
     5425                    $context[1] = substr($context[1], 0, 100) . '&#8230;'; 
    54265426 
    54275427                $marker = '<wpcontext>'.$context[1].'</wpcontext>';    // set up our marker 
     
    54415441        $pagelinkedfrom = str_replace('&', '&amp;', $pagelinkedfrom); 
    54425442 
    5443         $context = '[...] ' . esc_html( $excerpt ) . ' [...]'; 
     5443        $context = '[&#8230;] ' . esc_html( $excerpt ) . ' [&#8230;]'; 
    54445444        $pagelinkedfrom = $wpdb->escape( $pagelinkedfrom ); 
    54455445 
  • trunk/wp-includes/comment-template.php

    r24126 r24207  
    394394 * Retrieve the excerpt of the current comment. 
    395395 * 
    396  * Will cut each word and only output the first 20 words with '...' at the end. 
    397  * If the word count is less than 20, then no truncating is done and no '...' 
     396 * Will cut each word and only output the first 20 words with '&hellip;' at the end. 
     397 * If the word count is less than 20, then no truncating is done and no '&hellip;' 
    398398 * will appear. 
    399399 * 
     
    420420        $excerpt .= $blah[$i] . ' '; 
    421421    } 
    422     $excerpt .= ($use_dotdotdot) ? '...' : ''; 
     422    $excerpt .= ($use_dotdotdot) ? '&hellip;' : ''; 
    423423    return apply_filters('get_comment_excerpt', $excerpt); 
    424424} 
  • trunk/wp-includes/comment.php

    r23973 r24207  
    17541754        $excerpt = apply_filters('the_excerpt', $post->post_excerpt); 
    17551755    $excerpt = str_replace(']]>', ']]&gt;', $excerpt); 
    1756     $excerpt = wp_html_excerpt($excerpt, 252) . '...'; 
     1756    $excerpt = wp_html_excerpt($excerpt, 252) . '&#8230;'; 
    17571757 
    17581758    $post_title = apply_filters('the_title', $post->post_title, $post->ID); 
  • trunk/wp-includes/formatting.php

    r24129 r24207  
    21622162 * 
    21632163 * The excerpt word amount will be 55 words and if the amount is greater than 
    2164  * that, then the string ' [...]' will be appended to the excerpt. If the string 
     2164 * that, then the string ' [&hellip;]' will be appended to the excerpt. If the string 
    21652165 * is less than 55 words, then the content will be returned as is. 
    21662166 * 
    21672167 * The 55 word limit can be modified by plugins/themes using the excerpt_length filter 
    2168  * The ' [...]' string can be modified by plugins/themes using the excerpt_more filter 
     2168 * The ' [&hellip;]' string can be modified by plugins/themes using the excerpt_more filter 
    21692169 * 
    21702170 * @since 1.5.0 
     
    21832183        $text = str_replace(']]>', ']]&gt;', $text); 
    21842184        $excerpt_length = apply_filters('excerpt_length', 55); 
    2185         $excerpt_more = apply_filters('excerpt_more', ' ' . '[...]'); 
     2185        $excerpt_more = apply_filters('excerpt_more', ' ' . '[&hellip;]'); 
    21862186        $text = wp_trim_words( $text, $excerpt_length, $excerpt_more ); 
    21872187    } 
  • trunk/wp-includes/post-formats.php

    r24170 r24207  
    878878 
    879879    if ( null === $more_link_text ) 
    880         $more_link_text = __( '(more...)' ); 
     880        $more_link_text = __( '(more&hellip;)' ); 
    881881 
    882882    $output = ''; 
  • trunk/wp-includes/post-template.php

    r24191 r24207  
    182182 
    183183    if ( null === $more_link_text ) 
    184         $more_link_text = __( '(more...)' ); 
     184        $more_link_text = __( '(more&hellip;)' ); 
    185185 
    186186    $output = ''; 
  • trunk/wp-includes/post.php

    r24126 r24207  
    33403340 
    33413341        if (strlen($excerpt) > 255) { 
    3342             $excerpt = substr($excerpt,0,252) . '...'; 
     3342            $excerpt = substr($excerpt,0,252) . '&hellip;'; 
    33433343        } 
    33443344 
  • trunk/wp-login.php

    r24179 r24207  
    266266 
    267267    if ( $message && !wp_mail($user_email, $title, $message) ) 
    268         wp_die( __('The e-mail could not be sent.') . "<br />\n" . __('Possible reason: your host may have disabled the mail() function...') ); 
     268        wp_die( __('The e-mail could not be sent.') . "<br />\n" . __('Possible reason: your host may have disabled the mail() function.') ); 
    269269 
    270270    return true; 
     
    356356    $user_id = wp_create_user( $sanitized_user_login, $user_pass, $user_email ); 
    357357    if ( ! $user_id ) { 
    358         $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' ) ) ); 
     358        $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' ) ) ); 
    359359        return $errors; 
    360360    } 
  • trunk/wp-trackback.php

    r23604 r24207  
    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 ) . '&#8230;'; 
     91    $excerpt = wp_html_excerpt( $excerpt, 252 ) . '&#8230;'; 
    9292 
    9393    $comment_post_ID = (int) $tb_id; 
Note: See TracChangeset for help on using the changeset viewer.