Changeset 24207

Timestamp:

05/08/2013 09:27:31 PM (12 years ago)

Author:

SergeyBiryukov

Message:

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

Location:

trunk

Files:

• wp-admin/edit.php (modified) (1 diff)
• wp-admin/includes/class-wp-comments-list-table.php (modified) (1 diff)
• wp-admin/includes/dashboard.php (modified) (1 diff)
• wp-admin/includes/misc.php (modified) (1 diff)
• wp-admin/press-this.php (modified) (1 diff)
• wp-admin/theme-editor.php (modified) (1 diff)
• wp-admin/upload.php (modified) (3 diffs)
• wp-includes/class-wp-xmlrpc-server.php (modified) (2 diffs)
• wp-includes/comment-template.php (modified) (2 diffs)
• wp-includes/comment.php (modified) (1 diff)
• wp-includes/formatting.php (modified) (2 diffs)
• wp-includes/post-formats.php (modified) (1 diff)
• wp-includes/post-template.php (modified) (1 diff)
• wp-includes/post.php (modified) (1 diff)
• wp-login.php (modified) (2 diffs)
• wp-trackback.php (modified) (1 diff)

trunk/wp-admin/edit.php

@@ -118 +118 @@
                 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++;

trunk/wp-admin/includes/class-wp-comments-list-table.php

@@ -457 +457 @@
         $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 />';

trunk/wp-admin/includes/dashboard.php

@@ -828 +828 @@
 
         $content = $item->get_content();
-        $content = wp_html_excerpt($content, 50) . ' ...';
+        $content = wp_html_excerpt($content, 50) . ' …';
 
         if ( $link )

trunk/wp-admin/includes/misc.php

@@ -224 +224 @@
     $short_url = untrailingslashit( $short_url );
     if ( strlen( $short_url ) > 35 )
-        $short_url = substr( $short_url, 0, 32 ) . '...';
+        $short_url = substr( $short_url, 0, 32 ) . '…';
     return $short_url;
 }

trunk/wp-admin/press-this.php

@@ -586 +586 @@
         </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>

trunk/wp-admin/theme-editor.php

@@ -113 +113 @@
 
             $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>';

trunk/wp-admin/upload.php

@@ -100 +100 @@
 
                 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 );
@@ -112 +112 @@
 
                 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 );
@@ -124 +124 @@
 
                 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 );

trunk/wp-includes/class-wp-xmlrpc-server.php

@@ -5423 +5423 @@
                 // prevent really long link text
                 if ( strlen($context[1]) > 100 )
-                    $context[1] = substr($context[1], 0, 100) . '...';
+                    $context[1] = substr($context[1], 0, 100) . '…';
 
                 $marker = '<wpcontext>'.$context[1].'</wpcontext>';    // set up our marker
@@ -5441 +5441 @@
         $pagelinkedfrom = str_replace('&', '&amp;', $pagelinkedfrom);
 
-        $context = '[...] ' . esc_html( $excerpt ) . ' [...]';
+        $context = '[&#8230;] ' . esc_html( $excerpt ) . ' [&#8230;]';
         $pagelinkedfrom = $wpdb->escape( $pagelinkedfrom );
 

trunk/wp-includes/comment-template.php

@@ -394 +394 @@
  * 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 '…' at the end.
+ * If the word count is less than 20, then no truncating is done and no '…'
  * will appear.
  *
@@ -420 +420 @@
         $excerpt .= $blah[$i] . ' ';
     }
-    $excerpt .= ($use_dotdotdot) ? '...' : '';
+    $excerpt .= ($use_dotdotdot) ? '…' : '';
     return apply_filters('get_comment_excerpt', $excerpt);
 }

trunk/wp-includes/comment.php

@@ -1754 +1754 @@
         $excerpt = apply_filters('the_excerpt', $post->post_excerpt);
     $excerpt = str_replace(']]>', ']]>', $excerpt);
-    $excerpt = wp_html_excerpt($excerpt, 252) . '...';
+    $excerpt = wp_html_excerpt($excerpt, 252) . '…';
 
     $post_title = apply_filters('the_title', $post->post_title, $post->ID);

trunk/wp-includes/formatting.php

@@ -2162 +2162 @@
  *
  * 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 ' […]' 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 ' […]' string can be modified by plugins/themes using the excerpt_more filter
  *
  * @since 1.5.0
@@ -2183 +2183 @@
         $text = str_replace(']]>', ']]>', $text);
         $excerpt_length = apply_filters('excerpt_length', 55);
-        $excerpt_more = apply_filters('excerpt_more', ' ' . '[...]');
+        $excerpt_more = apply_filters('excerpt_more', ' ' . '[…]');
         $text = wp_trim_words( $text, $excerpt_length, $excerpt_more );
     }

trunk/wp-includes/post-formats.php

@@ -878 +878 @@
 
     if ( null === $more_link_text )
-        $more_link_text = __( '(more...)' );
+        $more_link_text = __( '(more…)' );
 
     $output = '';

trunk/wp-includes/post-template.php

@@ -182 +182 @@
 
     if ( null === $more_link_text )
-        $more_link_text = __( '(more...)' );
+        $more_link_text = __( '(more…)' );
 
     $output = '';

trunk/wp-includes/post.php

@@ -3340 +3340 @@
 
         if (strlen($excerpt) > 255) {
-            $excerpt = substr($excerpt,0,252) . '...';
+            $excerpt = substr($excerpt,0,252) . '…';
         }
 

trunk/wp-login.php

@@ -266 +266 @@
 
     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;
@@ -356 +356 @@
     $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;
     }

trunk/wp-trackback.php

@@ -88 +88 @@
         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 ) . '…';
+    $excerpt = wp_html_excerpt( $excerpt, 252 ) . '…';
 
     $comment_post_ID = (int) $tb_id;