Changeset 19966

Timestamp:

02/21/2012 03:35:05 PM (13 years ago)

Author:

nacin

Message:

Allow counting by characters in lieu of a word count, for East Asian languages. First pass. see #8759.

Location:

trunk

Files:

• wp-admin/js/word-count.dev.js (modified) (3 diffs)
• wp-includes/script-loader.php (modified) (1 diff)

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

@@ -1 @@
-
-(function($) {
+(function($,undefined) {
     wpWordCount = {
 
@@ -6 +5 @@
             strip : /<[a-zA-Z\/][^<>]*>/g, // strip HTML tags
             clean : /[0-9.(),;:!?%#$¿'"_+=\\/-]+/g, // regexp to remove punctuation, etc.
-            count : /\S\s+/g // counting regexp
+            w : /\S\s+/g, // word-counting regexp
+            c : /\S/g // char-counting regexp for asian languages
         },
 
         block : 0,
 
-        wc : function(tx) {
+        wc : function(tx, type) {
             var t = this, w = $('.word-count'), tc = 0;
+
+            if ( type === undefined )
+                type = wordCountL10n.type;
+            if ( type !== 'w' && type !== 'c' )
+                type = 'w';
 
             if ( t.block )
@@ -23 +28 @@
                     tx = tx.replace( t.settings.strip, ' ' ).replace( /&nbsp;|&#160;/gi, ' ' );
                     tx = tx.replace( t.settings.clean, '' );
-                    tx.replace( t.settings.count, function(){tc++;} );
+                    tx.replace( t.settings[type], function(){tc++;} );
                 }
                 w.html(tc.toString());

trunk/wp-includes/script-loader.php

@@ -279 +279 @@
 
     $scripts->add( 'word-count', "/wp-admin/js/word-count$suffix.js", array( 'jquery' ), false, 1 );
+    $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',
+    ) );
 
     $scripts->add( 'media-upload', "/wp-admin/js/media-upload$suffix.js", array( 'thickbox' ), false, 1 );