Ticket #8759: 8759.3.diff

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

@@ -1 @@
-(function($,undefined) {
+(function($,undefined,undefined,undefined) {
         wpWordCount = {
 
                 settings : {
                         strip : /<[a-zA-Z\/][^<>]*>/g, // strip HTML tags
+                },
+                
+                settingsLatin : {
                         clean : /[0-9.(),;:!?%#$¿'"_+=\\/-]+/g, // regexp to remove punctuation, etc.
-                        w : /\S\s+/g, // word-counting regexp
-                        c : /\S/g // char-counting regexp for asian languages
+                        count_w : /\S\s+/g, // word-counting regexp
+                        count_c_with_spaces : /[\S \u00A0\u3000]/g,
+                        count_c_without_spaces : /\S/g,
                 },
+                
+                settingsEastAsia : {
+                        count : /[\u3100-\u312F\u31A0-\u31BF\u4E00-\u9FCF\u3400-\u4DBF\uF900-\uFAFF\u2F00-\u2FDF\u2E80-\u2EFF\u31C0-\u31EF\u2FF0-\u2FFF\u1100-\u11FF\uA960-\uA97F\uD780-\uD7FF\u3130-\u318F\uFFA0-\uFFDC\uAC00-\uD7AF\u3040-\u309F\u30A0-\u30FF\u31F0-\u31FF\uFF65-\uFF9F\u3190-\u319F\uA4D0-\uA4FF\uA000-\uA48F\uA490-\uA4CF]/g, // currently misses 20000-2A6DF, 2A700-2B73F, 2B740-2B81F, 2F800-2FA1F, 1B000-1B0FF, 16F00-16F9F due to JavaScript RegExp restrictions
+                        count_punc : /[\u3000-\u303F\uFE30-\uFE4F\uFF01-\uFF60\uFE10-\uFE1F]/g, // regexp to remove CJK punctuation.
+                },
 
                 block : 0,
 
-                wc : function(tx, type) {
+                wc : function(tx, countLatinBy, countLatinSpaces, countEastAsiaPunc) {
                         var t = this, w = $('.word-count'), tc = 0;
 
-                        if ( type === undefined )
-                                type = wordCountL10n.type;
-                        if ( type !== 'w' && type !== 'c' )
-                                type = 'w';
-
+                        if ( countLatinBy === undefined )
+                                countLatinBy = wordCountL10n.countLatinBy;
+                        if ( countLatinBy !== 'w' && countLatinBy !== 'c' )
+                                countLatinBy = 'w';
+                        
+                        if ( countLatinSpaces === undefined )
+                                countLatinSpaces = wordCountL10n.countLatinSpaces;
+                        if ( countLatinSpaces !== 'y' && countLatinSpaces !== 'n' )
+                                countLatinSpaces = 'n';
+                        
+                        if ( countEastAsiaPunc === undefined )
+                                countEastasiaPunc = wordCountL10n.countEastAsiaPunc;
+                        if ( countEastAsiaPunc !== 'y' && countEastAsiaPunc !== 'n' )
+                                countEastAsiaPunc = 'y';
+                        
                         if ( t.block )
                                 return;
 
@@ -25 +44 @@
 
                         setTimeout( function() {
                                 if ( tx ) {
+                                        // general
                                         tx = tx.replace( t.settings.strip, ' ' ).replace( /&nbsp;|&#160;/gi, ' ' );
-                                        tx = tx.replace( t.settings.clean, '' );
-                                        tx.replace( t.settings[type], function(){tc++;} );
+                                        
+                                        // East Asia
+                                        tx = tx.replace( t.settingsEastAsia.count, function(){tc++; return '';} );
+                                        if ( countEastAsiaPunc === 'y' )
+                                                tx = tx.replace( t.settingsEastAsia.clean, function(){tc++; return '';} );
+                                        
+                                        // Latin
+                                        tx = tx.replace( t.settingsLatin.clean, '' );
+                                        if ( countLatinBy === 'w' )
+                                                tx.replace( t.settingsLatin.count_w, function(){tc++; return '';} );
+                                        else {
+                                                if ( countLatinSpaces === 'y' ) {
+                                                        tx = tx.replace( t.settingsLatin.count_c_with_spaces, function(){tc++; return '';} );
+                                                } else {
+                                                        tx = tx.replace( t.settingsLatin.count_c_without_spaces, function(){tc++; return '';} );
+                                                }
+                                        }
                                 }
                                 w.html(tc.toString());
 

wp-includes/script-loader.php

@@ -287 +287 @@
 
         $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',
+                /* translators: How would you like to count Latin (English, French, etc.)? 
+                   translate this to 'characters' if you think 'two words' shoule be counted as 7, 
+                   translate this to 'words' if you think 'two words' should be counted as 2.
+                   Default: 'words'.
+                    */
+                'countLatinBy' => 'characters' == _x( 'Count Latin by', 'Latin word count: as words or characters?' ) ? 'c' : 'w',
+                
+                /* translators: If you set countLatinBy to 'characters', would you count spaces? 
+                   translate this to 'yes' if you want spaces to be counted, 
+                   translate this to 'no' if you do not want spaces to be counted. 
+                   Default: 'no'.
+                    */
+                'countLatinSpaces' => 'yes' == _x( 'Count Latin spaces', 'Latin spaces count: yes or no?' ) ? 'y' : 'n',
+                
+                /* translators: Would you like to count punctuation marks for East Asia text? 
+                   translate this to 'yes' if you want punctuation marks to be counted, 
+                   translate this to 'no' if you do not want punctuation marks to be counted.
+                   Default: 'yes'.
+                    */
+                'countEastAsiaPunc' => 'no' == _x( 'Count East Asia punctuation marks', 'East Asia punctuation marks count: yes or no?' ) ? 'n' : 'y',
         ) );
 
         $scripts->add( 'media-upload', "/wp-admin/js/media-upload$suffix.js", array( 'thickbox' ), false, 1 );