<!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>[19966] trunk: Allow counting by characters in lieu of a word count, for East Asian languages.</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, #logmsg > ol { margin-left: 0; 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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/19966">19966</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2012-02-21 15:35:05 +0000 (Tue, 21 Feb 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Allow counting by characters in lieu of a word count, for East Asian languages. First pass. see <a href="http://core.trac.wordpress.org/ticket/8759">#8759</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminjswordcountdevjs">trunk/wp-admin/js/word-count.dev.js</a></li>
<li><a href="#trunkwpincludesscriptloaderphp">trunk/wp-includes/script-loader.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminjswordcountdevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/word-count.dev.js (19965 => 19966)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/word-count.dev.js 2012-02-21 15:26:08 UTC (rev 19965)
+++ trunk/wp-admin/js/word-count.dev.js 2012-02-21 15:35:05 UTC (rev 19966)
</span><span class="lines">@@ -1,18 +1,23 @@
</span><del>-
-(function($) {
</del><ins>+(function($,undefined) {
</ins><span class="cx"> wpWordCount = {
</span><span class="cx">
</span><span class="cx"> settings : {
</span><span class="cx"> strip : /<[a-zA-Z\/][^<>]*>/g, // strip HTML tags
</span><span class="cx"> clean : /[0-9.(),;:!?%#$¿'"_+=\\/-]+/g, // regexp to remove punctuation, etc.
</span><del>- count : /\S\s+/g // counting regexp
</del><ins>+ w : /\S\s+/g, // word-counting regexp
+ c : /\S/g // char-counting regexp for asian languages
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> block : 0,
</span><span class="cx">
</span><del>- wc : function(tx) {
</del><ins>+ wc : function(tx, type) {
</ins><span class="cx"> var t = this, w = $('.word-count'), tc = 0;
</span><span class="cx">
</span><ins>+ if ( type === undefined )
+ type = wordCountL10n.type;
+ if ( type !== 'w' && type !== 'c' )
+ type = 'w';
+
</ins><span class="cx"> if ( t.block )
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -22,7 +27,7 @@
</span><span class="cx"> if ( tx ) {
</span><span class="cx"> tx = tx.replace( t.settings.strip, ' ' ).replace( /&nbsp;|&#160;/gi, ' ' );
</span><span class="cx"> tx = tx.replace( t.settings.clean, '' );
</span><del>- tx.replace( t.settings.count, function(){tc++;} );
</del><ins>+ tx.replace( t.settings[type], function(){tc++;} );
</ins><span class="cx"> }
</span><span class="cx"> w.html(tc.toString());
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesscriptloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/script-loader.php (19965 => 19966)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/script-loader.php 2012-02-21 15:26:08 UTC (rev 19965)
+++ trunk/wp-includes/script-loader.php 2012-02-21 15:35:05 UTC (rev 19966)
</span><span class="lines">@@ -278,6 +278,11 @@
</span><span class="cx"> $scripts->add( 'wpdialogs-popup', "/wp-includes/js/tinymce/plugins/wpdialogs/js/popup$suffix.js", array( 'wpdialogs' ), false, 1 );
</span><span class="cx">
</span><span class="cx"> $scripts->add( 'word-count', "/wp-admin/js/word-count$suffix.js", array( 'jquery' ), false, 1 );
</span><ins>+ $scripts->localize( 'word-count', 'wordCountL10n', array(
+ /* 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. */
+ 'type' => 'characters' == _x( 'words', 'word count: words or characters?' ) ? 'c' : 'w',
+ ) );
</ins><span class="cx">
</span><span class="cx"> $scripts->add( 'media-upload', "/wp-admin/js/media-upload$suffix.js", array( 'thickbox' ), false, 1 );
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>