Changeset 33440 for trunk/src/wp-includes/formatting.php

Timestamp:

07/27/2015 11:18:55 AM (10 years ago)

Author:

iseulde

Message:

Editor: word count: better names for types.

Also fix it in wp_trim_words().

Fixes #30966.

File:

• trunk/src/wp-includes/formatting.php (modified) (3 diffs)

trunk/src/wp-includes/formatting.php

@@ -2813 +2813 @@
  */
 function wp_trim_words( $text, $num_words = 55, $more = null ) {
-    if ( null === $more )
+    if ( null === $more ) {
         $more = __( '…' );
+    }
+
     $original_text = $text;
     $text = wp_strip_all_tags( $text );
-    /* translators: If your word count is based on single characters (East Asian characters),
-       enter 'characters'. Otherwise, enter 'words'. Do not translate into your own language. */
-    if ( 'characters' == _x( 'words', 'word count: words or characters?' ) && preg_match( '/^utf\-?8$/i', get_option( 'blog_charset' ) ) ) {
+
+    /* translators: If your word count is based on single characters (e.g. East Asian characters),
+       enter 'characters_excluding_spaces' or 'characters_including_spaces'. Otherwise, enter 'words'.
+       Do not translate into your own language. */
+    if ( strpos( _x( 'words', 'Word count type. Do not translate!' ), 'characters' ) === 0 && preg_match( '/^utf\-?8$/i', get_option( 'blog_charset' ) ) ) {
         $text = trim( preg_replace( "/[\n\r\t ]+/", ' ', $text ), ' ' );
         preg_match_all( '/./u', $text, $words_array );
@@ -2828 +2832 @@
         $sep = ' ';
     }
+
     if ( count( $words_array ) > $num_words ) {
         array_pop( $words_array );
@@ -2835 +2840 @@
         $text = implode( $sep, $words_array );
     }
+
     /**
      * Filter the text content after words have been trimmed.