Skip to content

Commit

Permalink
Use ellipsis instead of three dots. props tjsingleton, jordie23, wojt…
Browse files Browse the repository at this point in the history 
…ek.szkutnik, DrewAPicture, SergeyBiryukov. see #8714.

git-svn-id: http://core.svn.wordpress.org/trunk@24207 1a063a9b-81f0-0310-95a4-ce76da25c4cd
  • Loading branch information
@SergeyBiryukov
SergeyBiryukov committed May 8, 2013
1 parent 5ee1a96 commit 57c10ea
Show file tree
Hide file tree
Showing 16 changed files with 26 additions and 26 deletions.
4 changes: 2 additions & 2 deletions wp-admin/edit.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,10 +117,10 @@

if ( $post_del->post_type == 'attachment' ) {
if ( ! wp_delete_attachment($post_id) )
wp_die( __('Error in deleting...') );
wp_die( __('Error in deleting.') );
} else {
if ( !wp_delete_post($post_id) )
wp_die( __('Error in deleting...') );
wp_die( __('Error in deleting.') );
}
$deleted++;
}
Expand Down
2 changes: 1 addition & 1 deletion wp-admin/includes/class-wp-comments-list-table.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@ function column_author( $comment ) {
$author_url = '';
$author_url_display = preg_replace( '|http://(www\.)?|i', '', $author_url );
if ( strlen( $author_url_display ) > 50 )
$author_url_display = substr( $author_url_display, 0, 49 ) . '...';
$author_url_display = substr( $author_url_display, 0, 49 ) . '…';

echo "<strong>"; comment_author(); echo '</strong><br />';
if ( !empty( $author_url ) )
Expand Down
2 changes: 1 addition & 1 deletion wp-admin/includes/dashboard.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -827,7 +827,7 @@ function wp_dashboard_incoming_links_output() {
$publisher = "<strong>$publisher</strong>";

$content = $item->get_content();
$content = wp_html_excerpt($content, 50) . ' ...';
$content = wp_html_excerpt($content, 50) . ' &hellip;';

if ( $link )
/* translators: incoming links feed, %1$s is other person, %3$s is content */
Expand Down
2 changes: 1 addition & 1 deletion wp-admin/includes/misc.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ function url_shorten( $url ) {
$short_url = str_replace( array( 'http://', 'www.' ), '', $url );
$short_url = untrailingslashit( $short_url );
if ( strlen( $short_url ) > 35 )
$short_url = substr( $short_url, 0, 32 ) . '...';
$short_url = substr( $short_url, 0, 32 ) . '&hellip;';
return $short_url;
}

Expand Down
2 changes: 1 addition & 1 deletion wp-admin/press-this.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -585,7 +585,7 @@ function setup_photo_actions() {
</div>
</div>

<div id="waiting" style="display: none"><span class="spinner"></span> <span><?php esc_html_e( 'Loading...' ); ?></span></div>
<div id="waiting" style="display: none"><span class="spinner"></span> <span><?php esc_html_e( 'Loading&hellip;' ); ?></span></div>

<div id="extra-fields" style="display: none"></div>

Expand Down
2 changes: 1 addition & 1 deletion wp-admin/theme-editor.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@
$functions = wp_doc_link_parse( $content );

$docs_select = '<select name="docs-list" id="docs-list">';
$docs_select .= '<option value="">' . esc_attr__( 'Function Name...' ) . '</option>';
$docs_select .= '<option value="">' . esc_attr__( 'Function Name&hellip;' ) . '</option>';
foreach ( $functions as $function ) {
$docs_select .= '<option value="' . esc_attr( urlencode( $function ) ) . '">' . htmlspecialchars( $function ) . '()</option>';
}
Expand Down
6 changes: 3 additions & 3 deletions wp-admin/upload.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
wp_die( __( 'You are not allowed to move this post to the trash.' ) );

if ( !wp_trash_post( $post_id ) )
wp_die( __( 'Error in moving to trash...' ) );
wp_die( __( 'Error in moving to trash.' ) );
}
$location = add_query_arg( array( 'trashed' => count( $post_ids ), 'ids' => join( ',', $post_ids ) ), $location );
break;
Expand All @@ -111,7 +111,7 @@
wp_die( __( 'You are not allowed to move this post out of the trash.' ) );

if ( !wp_untrash_post( $post_id ) )
wp_die( __( 'Error in restoring from trash...' ) );
wp_die( __( 'Error in restoring from trash.' ) );
}
$location = add_query_arg( 'untrashed', count( $post_ids ), $location );
break;
Expand All @@ -123,7 +123,7 @@
wp_die( __( 'You are not allowed to delete this post.' ) );

if ( !wp_delete_attachment( $post_id_del ) )
wp_die( __( 'Error in deleting...' ) );
wp_die( __( 'Error in deleting.' ) );
}
$location = add_query_arg( 'deleted', count( $post_ids ), $location );
break;
Expand Down
4 changes: 2 additions & 2 deletions wp-includes/class-wp-xmlrpc-server.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5422,7 +5422,7 @@ function pingback_ping($args) {

// prevent really long link text
if ( strlen($context[1]) > 100 )
$context[1] = substr($context[1], 0, 100) . '...';
$context[1] = substr($context[1], 0, 100) . '&#8230;';

$marker = '<wpcontext>'.$context[1].'</wpcontext>'; // set up our marker
$excerpt= str_replace($context[0], $marker, $excerpt); // swap out the link for our marker
Expand All @@ -5440,7 +5440,7 @@ function pingback_ping($args) {

$pagelinkedfrom = str_replace('&', '&amp;', $pagelinkedfrom);

$context = '[...] ' . esc_html( $excerpt ) . ' [...]';
$context = '[&#8230;] ' . esc_html( $excerpt ) . ' [&#8230;]';
$pagelinkedfrom = $wpdb->escape( $pagelinkedfrom );

$comment_post_ID = (int) $post_ID;
Expand Down
6 changes: 3 additions & 3 deletions wp-includes/comment-template.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -393,8 +393,8 @@ function comment_date( $d = '', $comment_ID = 0 ) {
/**
* Retrieve the excerpt of the current comment.
*
* Will cut each word and only output the first 20 words with '...' at the end.
* If the word count is less than 20, then no truncating is done and no '...'
* Will cut each word and only output the first 20 words with '&hellip;' at the end.
* If the word count is less than 20, then no truncating is done and no '&hellip;'
* will appear.
*
* @since 1.5.0
Expand All @@ -419,7 +419,7 @@ function get_comment_excerpt( $comment_ID = 0 ) {
for ($i=0; $i<$k; $i++) {
$excerpt .= $blah[$i] . ' ';
}
$excerpt .= ($use_dotdotdot) ? '...' : '';
$excerpt .= ($use_dotdotdot) ? '&hellip;' : '';
return apply_filters('get_comment_excerpt', $excerpt);
}

Expand Down
2 changes: 1 addition & 1 deletion wp-includes/comment.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1753,7 +1753,7 @@ function do_trackbacks($post_id) {
else
$excerpt = apply_filters('the_excerpt', $post->post_excerpt);
$excerpt = str_replace(']]>', ']]&gt;', $excerpt);
$excerpt = wp_html_excerpt($excerpt, 252) . '...';
$excerpt = wp_html_excerpt($excerpt, 252) . '&#8230;';

$post_title = apply_filters('the_title', $post->post_title, $post->ID);
$post_title = strip_tags($post_title);
Expand Down
6 changes: 3 additions & 3 deletions wp-includes/formatting.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2161,11 +2161,11 @@ function human_time_diff( $from, $to = '' ) {
* Generates an excerpt from the content, if needed.
*
* The excerpt word amount will be 55 words and if the amount is greater than
* that, then the string ' [...]' will be appended to the excerpt. If the string
* that, then the string ' [&hellip;]' will be appended to the excerpt. If the string
* is less than 55 words, then the content will be returned as is.
*
* The 55 word limit can be modified by plugins/themes using the excerpt_length filter
* The ' [...]' string can be modified by plugins/themes using the excerpt_more filter
* The ' [&hellip;]' string can be modified by plugins/themes using the excerpt_more filter
*
* @since 1.5.0
*
Expand All @@ -2182,7 +2182,7 @@ function wp_trim_excerpt($text = '') {
$text = apply_filters('the_content', $text);
$text = str_replace(']]>', ']]&gt;', $text);
$excerpt_length = apply_filters('excerpt_length', 55);
$excerpt_more = apply_filters('excerpt_more', ' ' . '[...]');
$excerpt_more = apply_filters('excerpt_more', ' ' . '[&hellip;]');
$text = wp_trim_words( $text, $excerpt_length, $excerpt_more );
}
return apply_filters('wp_trim_excerpt', $text, $raw_excerpt);
Expand Down
2 changes: 1 addition & 1 deletion wp-includes/post-formats.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -877,7 +877,7 @@ function get_the_remaining_content( $more_link_text = null, $strip_teaser = fals
$post = get_post();

if ( null === $more_link_text )
$more_link_text = __( '(more...)' );
$more_link_text = __( '(more&hellip;)' );

$output = '';
$has_teaser = false;
Expand Down
2 changes: 1 addition & 1 deletion wp-includes/post-template.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ function get_the_content( $more_link_text = null, $strip_teaser = false ) {
$post = get_post();

if ( null === $more_link_text )
$more_link_text = __( '(more...)' );
$more_link_text = __( '(more&hellip;)' );

$output = '';
$has_teaser = false;
Expand Down
2 changes: 1 addition & 1 deletion wp-includes/post.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3339,7 +3339,7 @@ function trackback_url_list($tb_list, $post_id) {
$excerpt = strip_tags($post_excerpt ? $post_excerpt : $post_content);

if (strlen($excerpt) > 255) {
$excerpt = substr($excerpt,0,252) . '...';
$excerpt = substr($excerpt,0,252) . '&hellip;';
}

$trackback_urls = explode(',', $tb_list);
Expand Down
4 changes: 2 additions & 2 deletions wp-login.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ function retrieve_password() {
$message = apply_filters('retrieve_password_message', $message, $key);

if ( $message && !wp_mail($user_email, $title, $message) )
wp_die( __('The e-mail could not be sent.') . "<br />\n" . __('Possible reason: your host may have disabled the mail() function...') );
wp_die( __('The e-mail could not be sent.') . "<br />\n" . __('Possible reason: your host may have disabled the mail() function.') );

return true;
}
Expand Down Expand Up @@ -355,7 +355,7 @@ function register_new_user( $user_login, $user_email ) {
$user_pass = wp_generate_password( 12, false);
$user_id = wp_create_user( $sanitized_user_login, $user_pass, $user_email );
if ( ! $user_id ) {
$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' ) ) );
$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' ) ) );
return $errors;
}

Expand Down
4 changes: 2 additions & 2 deletions wp-trackback.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ function trackback_response($error = 0, $error_message = '') {
if ( !pings_open($tb_id) )
trackback_response(1, 'Sorry, trackbacks are closed for this item.');

$title = wp_html_excerpt( $title, 250 ).'...';
$excerpt = wp_html_excerpt( $excerpt, 252 ).'...';
$title = wp_html_excerpt( $title, 250 ) . '&#8230;';
$excerpt = wp_html_excerpt( $excerpt, 252 ) . '&#8230;';

$comment_post_ID = (int) $tb_id;
$comment_author = $blog_name;
Expand Down

0 comments on commit 57c10ea

Please sign in to comment.