Index: wp-admin/includes/schema.php =================================================================== --- wp-admin/includes/schema.php (revision 10258) +++ wp-admin/includes/schema.php (working copy) @@ -301,6 +301,12 @@ add_option('widget_rss', array()); add_option('update_core', array()); add_option('dismissed_update_core', array()); + + if ( defined( 'WPLANG' ) && preg_match( '/^(bo|dz|ii|ja|km|my|th|zh)/', WPLANG ) ) { + add_option('counting_method', 'character'); + } else { + add_option('counting_method', 'word'); + } // Delete unused options $unusedoptions = array ('blodotgsping_url', 'bodyterminator', 'emailtestonly', 'phoneemail_separator', 'smilies_directory', 'subjectprefix', 'use_bbcode', 'use_blodotgsping', 'use_phoneemail', 'use_quicktags', 'use_weblogsping', 'weblogs_cache_file', 'use_preview', 'use_htmltrans', 'smilies_directory', 'fileupload_allowedusers', 'use_phoneemail', 'default_post_status', 'default_post_category', 'archive_mode', 'time_difference', 'links_minadminlevel', 'links_use_adminlevels', 'links_rating_type', 'links_rating_char', 'links_rating_ignore_zero', 'links_rating_single_image', 'links_rating_image0', 'links_rating_image1', 'links_rating_image2', 'links_rating_image3', 'links_rating_image4', 'links_rating_image5', 'links_rating_image6', 'links_rating_image7', 'links_rating_image8', 'links_rating_image9', 'weblogs_cacheminutes', 'comment_allowed_tags', 'search_engine_friendly_urls', 'default_geourl_lat', 'default_geourl_lon', 'use_default_geourl', 'weblogs_xml_url', 'new_users_can_blog', '_wpnonce', '_wp_http_referer', 'Update', 'action', 'rich_editing', 'autosave_interval', 'deactivated_plugins'); Index: wp-admin/js/word-count.js =================================================================== --- wp-admin/js/word-count.js (revision 10258) +++ wp-admin/js/word-count.js (working copy) @@ -24,9 +24,17 @@ setTimeout( function() { if ( tx ) { - tx = tx.replace( /<.[^<>]*?>/g, ' ' ).replace( / /gi, ' ' ); - tx = tx.replace( /[0-9.(),;:!?%#$¿'"_+=\\/-]*/g, '' ); - tx.replace( /\S\s+/g, function(){tc++;} ); + if ( wordCountL10n.method == 'character' ) { + tx = tx.replace( /<.[^<>]*?>/g, '' ); + tx = tx.replace( /&(nbsp|#160|#x00a0);/gi, '' ); + tx = tx.replace( /[ \s]/g, '' ); + tx = tx.replace( /&(#[\d]{2,5}|#x[a-fA-F\d]{1,4}|[a-zA-Z]{2,8}[1-4]{0,2});/g, ' ' ); + tc = tx.length; + } else { + tx = tx.replace( /<.[^<>]*?>/g, ' ' ).replace( /&(nbsp|#160|#x00a0);/gi, ' ' ); + tx = tx.replace( /[0-9.(),;:!?%#$¿'"_+=\\/-]*/g, '' ); + tx.replace( /\S\s+/g, function(){tc++;} ); + } } w.html(tc.toString()); Index: wp-admin/options-writing.php =================================================================== --- wp-admin/options-writing.php (revision 10258) +++ wp-admin/options-writing.php (working copy) @@ -53,6 +53,16 @@ ?> +