<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[33440] trunk: Editor: word count: better names for types.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/33440">33440</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/33440","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>iseulde</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-07-27 11:18:55 +0000 (Mon, 27 Jul 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Editor: word count: better names for types.
Also fix it in wp_trim_words().
Fixes <a href="https://core.trac.wordpress.org/ticket/30966">#30966</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminjswordcountjs">trunk/src/wp-admin/js/word-count.js</a></li>
<li><a href="#trunksrcwpincludesformattingphp">trunk/src/wp-includes/formatting.php</a></li>
<li><a href="#trunksrcwpincludesscriptloaderphp">trunk/src/wp-includes/script-loader.php</a></li>
<li><a href="#trunktestsqunitwpadminjswordcountjs">trunk/tests/qunit/wp-admin/js/word-count.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminjswordcountjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/js/word-count.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/js/word-count.js 2015-07-27 03:33:24 UTC (rev 33439)
+++ trunk/src/wp-admin/js/word-count.js 2015-07-27 11:18:55 UTC (rev 33440)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -61,8 +61,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ].join( '' ), 'g' ),
</span><span class="cx" style="display: block; padding: 0 10px"> astralRegExp: /[\uD800-\uDBFF][\uDC00-\uDFFF]/g,
</span><span class="cx" style="display: block; padding: 0 10px"> wordsRegExp: /\S\s+/g,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- charactersRegExp: /\S/g,
- allRegExp: /[^\f\n\r\t\v\u00AD\u2028\u2029]/g,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ characters_excluding_spacesRegExp: /\S/g,
+ characters_including_spacesRegExp: /[^\f\n\r\t\v\u00AD\u2028\u2029]/g,
</ins><span class="cx" style="display: block; padding: 0 10px"> l10n: window.wordCountL10n || {}
</span><span class="cx" style="display: block; padding: 0 10px"> };
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -71,7 +71,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> type = type || this.settings.l10n.type;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( type !== 'characters' && type !== 'all' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( type !== 'characters_excluding_spaces' && type !== 'characters_including_spaces' ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> type = 'words';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludesformattingphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/formatting.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/formatting.php 2015-07-27 03:33:24 UTC (rev 33439)
+++ trunk/src/wp-includes/formatting.php 2015-07-27 11:18:55 UTC (rev 33440)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2812,13 +2812,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string Trimmed text.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_trim_words( $text, $num_words = 55, $more = null ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( null === $more )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( null === $more ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $more = __( '…' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $original_text = $text;
</span><span class="cx" style="display: block; padding: 0 10px"> $text = wp_strip_all_tags( $text );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* 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' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /* 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' ) ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $text = trim( preg_replace( "/[\n\r\t ]+/", ' ', $text ), ' ' );
</span><span class="cx" style="display: block; padding: 0 10px"> preg_match_all( '/./u', $text, $words_array );
</span><span class="cx" style="display: block; padding: 0 10px"> $words_array = array_slice( $words_array[0], 0, $num_words + 1 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2827,6 +2831,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $words_array = preg_split( "/[\n\r\t ]+/", $text, $num_words + 1, PREG_SPLIT_NO_EMPTY );
</span><span class="cx" style="display: block; padding: 0 10px"> $sep = ' ';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( count( $words_array ) > $num_words ) {
</span><span class="cx" style="display: block; padding: 0 10px"> array_pop( $words_array );
</span><span class="cx" style="display: block; padding: 0 10px"> $text = implode( $sep, $words_array );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2834,6 +2839,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $text = implode( $sep, $words_array );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filter the text content after words have been trimmed.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre></div>
<a id="trunksrcwpincludesscriptloaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/script-loader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/script-loader.php 2015-07-27 03:33:24 UTC (rev 33439)
+++ trunk/src/wp-includes/script-loader.php 2015-07-27 11:18:55 UTC (rev 33440)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -401,10 +401,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'word-count', "/wp-admin/js/word-count$suffix.js", array(), false, 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> did_action( 'init' ) && $scripts->localize( 'word-count', 'wordCountL10n', array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: If your word count is based on single characters (East Asian characters),
- enter 'characters', or 'all' to include spaces. Otherwise, enter 'words'.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* 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'.
</ins><span class="cx" style="display: block; padding: 0 10px"> Do not translate into your own language. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'type' => _x( 'words', 'word count: words, characters or all?' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'type' => _x( 'words', 'Word count type. Do not translate!' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'shortcodes' => ! empty( $GLOBALS['shortcode_tags'] ) ? array_keys( $GLOBALS['shortcode_tags'] ) : array()
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsqunitwpadminjswordcountjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/qunit/wp-admin/js/word-count.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/qunit/wp-admin/js/word-count.js 2015-07-27 03:33:24 UTC (rev 33439)
+++ trunk/tests/qunit/wp-admin/js/word-count.js 2015-07-27 11:18:55 UTC (rev 33440)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,74 +7,74 @@
</span><span class="cx" style="display: block; padding: 0 10px"> message: 'Basic test.',
</span><span class="cx" style="display: block; padding: 0 10px"> string: 'one two three',
</span><span class="cx" style="display: block; padding: 0 10px"> words: 3,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- characters: 11,
- all: 13
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ characters_excluding_spaces: 11,
+ characters_including_spaces: 13
</ins><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> {
</span><span class="cx" style="display: block; padding: 0 10px"> message: 'HTML tags.',
</span><span class="cx" style="display: block; padding: 0 10px"> string: 'one <em class="test">two</em><br />three',
</span><span class="cx" style="display: block; padding: 0 10px"> words: 3,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- characters: 11,
- all: 12
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ characters_excluding_spaces: 11,
+ characters_including_spaces: 12
</ins><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> {
</span><span class="cx" style="display: block; padding: 0 10px"> message: 'Line breaks.',
</span><span class="cx" style="display: block; padding: 0 10px"> string: 'one\ntwo\nthree',
</span><span class="cx" style="display: block; padding: 0 10px"> words: 3,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- characters: 11,
- all: 11
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ characters_excluding_spaces: 11,
+ characters_including_spaces: 11
</ins><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> {
</span><span class="cx" style="display: block; padding: 0 10px"> message: 'Encoded spaces.',
</span><span class="cx" style="display: block; padding: 0 10px"> string: 'one two three',
</span><span class="cx" style="display: block; padding: 0 10px"> words: 3,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- characters: 11,
- all: 13
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ characters_excluding_spaces: 11,
+ characters_including_spaces: 13
</ins><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> {
</span><span class="cx" style="display: block; padding: 0 10px"> message: 'Punctuation.',
</span><span class="cx" style="display: block; padding: 0 10px"> string: 'It\'s two three \u2026 4?',
</span><span class="cx" style="display: block; padding: 0 10px"> words: 3,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- characters: 15,
- all: 19
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ characters_excluding_spaces: 15,
+ characters_including_spaces: 19
</ins><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> {
</span><span class="cx" style="display: block; padding: 0 10px"> message: 'Em dash.',
</span><span class="cx" style="display: block; padding: 0 10px"> string: 'one\u2014two--three',
</span><span class="cx" style="display: block; padding: 0 10px"> words: 3,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- characters: 14,
- all: 14
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ characters_excluding_spaces: 14,
+ characters_including_spaces: 14
</ins><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> {
</span><span class="cx" style="display: block; padding: 0 10px"> message: 'Shortcodes.',
</span><span class="cx" style="display: block; padding: 0 10px"> string: 'one [shortcode attribute="value"]two[/shortcode]three',
</span><span class="cx" style="display: block; padding: 0 10px"> words: 3,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- characters: 11,
- all: 12
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ characters_excluding_spaces: 11,
+ characters_including_spaces: 12
</ins><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> {
</span><span class="cx" style="display: block; padding: 0 10px"> message: 'Astrals.',
</span><span class="cx" style="display: block; padding: 0 10px"> string: '\uD83D\uDCA9',
</span><span class="cx" style="display: block; padding: 0 10px"> words: 1,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- characters: 1,
- all: 1
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ characters_excluding_spaces: 1,
+ characters_including_spaces: 1
</ins><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> {
</span><span class="cx" style="display: block; padding: 0 10px"> message: 'HTML comment.',
</span><span class="cx" style="display: block; padding: 0 10px"> string: 'one<!-- comment -->two three',
</span><span class="cx" style="display: block; padding: 0 10px"> words: 2,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- characters: 11,
- all: 12
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ characters_excluding_spaces: 11,
+ characters_including_spaces: 12
</ins><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> {
</span><span class="cx" style="display: block; padding: 0 10px"> message: 'HTML entity.',
</span><span class="cx" style="display: block; padding: 0 10px"> string: '> test',
</span><span class="cx" style="display: block; padding: 0 10px"> words: 1,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- characters: 5,
- all: 6
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ characters_excluding_spaces: 5,
+ characters_including_spaces: 6
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> ], function( test ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- _.each( [ 'words', 'characters', 'all' ], function( type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ _.each( [ 'words', 'characters_excluding_spaces', 'characters_including_spaces' ], function( type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> assert.equal( wordCounter.count( test.string, type ), test[ type ], test.message + ' (' + type + ')' );
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span></span></pre>
</div>
</div>
</body>
</html>