Changeset 33440

Timestamp:

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

Author:

iseulde

Message:

Editor: word count: better names for types.

Also fix it in wp_trim_words().

Fixes #30966.

Location:

trunk

Files:

• src/wp-admin/js/word-count.js (modified) (2 diffs)
• src/wp-includes/formatting.php (modified) (3 diffs)
• src/wp-includes/script-loader.php (modified) (1 diff)
• tests/qunit/wp-admin/js/word-count.js (modified) (10 diffs)

trunk/src/wp-admin/js/word-count.js

@@ -62 +62 @@
         astralRegExp: /[\uD800-\uDBFF][\uDC00-\uDFFF]/g,
         wordsRegExp: /\S\s+/g,
-        charactersRegExp: /\S/g,
-        allRegExp: /[^\f\n\r\t\v\u00AD\u2028\u2029]/g,
+        characters_excluding_spacesRegExp: /\S/g,
+        characters_including_spacesRegExp: /[^\f\n\r\t\v\u00AD\u2028\u2029]/g,
         l10n: window.wordCountL10n || {}
     };
@@ -72 +72 @@
         type = type || this.settings.l10n.type;
 
-        if ( type !== 'characters' && type !== 'all' ) {
+        if ( type !== 'characters_excluding_spaces' && type !== 'characters_including_spaces' ) {
             type = 'words';
         }

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.

trunk/src/wp-includes/script-loader.php

@@ -402 +402 @@
     $scripts->add( 'word-count', "/wp-admin/js/word-count$suffix.js", array(), false, 1 );
     did_action( 'init' ) && $scripts->localize( 'word-count', 'wordCountL10n', array(
-        /* translators: If your word count is based on single characters (East Asian characters),
-           enter 'characters', or 'all' to include spaces. Otherwise, enter 'words'.
+        /* 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. */
-        'type' => _x( 'words', 'word count: words, characters or all?' ),
+        'type' => _x( 'words', 'Word count type. Do not translate!' ),
         'shortcodes' => ! empty( $GLOBALS['shortcode_tags'] ) ? array_keys( $GLOBALS['shortcode_tags'] ) : array()
     ) );

trunk/tests/qunit/wp-admin/js/word-count.js

@@ -8 +8 @@
                 string: 'one two three',
                 words: 3,
-                characters: 11,
-                all: 13
+                characters_excluding_spaces: 11,
+                characters_including_spaces: 13
             },
             {
@@ -15 +15 @@
                 string: 'one <em class="test">two</em><br />three',
                 words: 3,
-                characters: 11,
-                all: 12
+                characters_excluding_spaces: 11,
+                characters_including_spaces: 12
             },
             {
@@ -22 +22 @@
                 string: 'one\ntwo\nthree',
                 words: 3,
-                characters: 11,
-                all: 11
+                characters_excluding_spaces: 11,
+                characters_including_spaces: 11
             },
             {
@@ -29 +29 @@
                 string: 'one&nbsp;two&#160;three',
                 words: 3,
-                characters: 11,
-                all: 13
+                characters_excluding_spaces: 11,
+                characters_including_spaces: 13
             },
             {
@@ -36 +36 @@
                 string: 'It\'s two three \u2026 4?',
                 words: 3,
-                characters: 15,
-                all: 19
+                characters_excluding_spaces: 15,
+                characters_including_spaces: 19
             },
             {
@@ -43 +43 @@
                 string: 'one\u2014two--three',
                 words: 3,
-                characters: 14,
-                all: 14
+                characters_excluding_spaces: 14,
+                characters_including_spaces: 14
             },
             {
@@ -50 +50 @@
                 string: 'one [shortcode attribute="value"]two[/shortcode]three',
                 words: 3,
-                characters: 11,
-                all: 12
+                characters_excluding_spaces: 11,
+                characters_including_spaces: 12
             },
             {
@@ -57 +57 @@
                 string: '\uD83D\uDCA9',
                 words: 1,
-                characters: 1,
-                all: 1
+                characters_excluding_spaces: 1,
+                characters_including_spaces: 1
             },
             {
@@ -64 +64 @@
                 string: 'one<!-- comment -->two three',
                 words: 2,
-                characters: 11,
-                all: 12
+                characters_excluding_spaces: 11,
+                characters_including_spaces: 12
             },
             {
@@ -71 +71 @@
                 string: '&gt; test',
                 words: 1,
-                characters: 5,
-                all: 6
+                characters_excluding_spaces: 5,
+                characters_including_spaces: 6
             }
         ], function( test ) {
-            _.each( [ 'words', 'characters', 'all' ], function( type ) {
+            _.each( [ 'words', 'characters_excluding_spaces', 'characters_including_spaces' ], function( type ) {
                 assert.equal( wordCounter.count( test.string, type ), test[ type ], test.message + ' (' + type + ')' );
             } );