Changeset 19853

Timestamp:

02/07/2012 06:06:12 PM (13 years ago)

Author:

nacin

Message:

Allow localized commas to be used as tag separators. see #7897.

Location:

trunk

Files:

• wp-admin/includes/ajax-actions.php (modified) (1 diff)
• wp-admin/includes/class-wp-posts-list-table.php (modified) (2 diffs)
• wp-admin/includes/meta-boxes.php (modified) (2 diffs)
• wp-admin/includes/post.php (modified) (1 diff)
• wp-admin/includes/template.php (modified) (1 diff)
• wp-admin/js/inline-edit-post.dev.js (modified) (2 diffs)
• wp-admin/js/post.dev.js (modified) (6 diffs)
• wp-includes/post.php (modified) (1 diff)
• wp-includes/script-loader.php (modified) (2 diffs)

trunk/wp-admin/includes/ajax-actions.php

@@ -67 +67 @@
     $s = stripslashes( $_GET['q'] );
 
+    $comma = _x( ',', 'tag delimiter' );
+    if ( ',' !== $comma )
+        $s = str_replace( $comma, ',', $s );
     if ( false !== strpos( $s, ',' ) ) {
         $s = explode( ',', $s );

trunk/wp-admin/includes/class-wp-posts-list-table.php

@@ -610 +610 @@
                         );
                     }
-                    echo join( ', ', $out );
+                    /* translators: used between list items, there is a space after the comma */
+                    echo join( __( ', ' ), $out );
                 } else {
                     _e( 'Uncategorized' );
@@ -630 +631 @@
                         );
                     }
-                    echo join( ', ', $out );
+                    /* translators: used between list items, there is a space after the comma */
+                    echo join( __( ', ' ), $out );
                 } else {
                     _e( 'No Tags' );

trunk/wp-admin/includes/meta-boxes.php

@@ -277 +277 @@
     $taxonomy = get_taxonomy($taxonomy);
     $disabled = !current_user_can($taxonomy->cap->assign_terms) ? 'disabled="disabled"' : '';
+    $comma = _x( ',', 'tag delimiter' );
 ?>
 <div class="tagsdiv" id="<?php echo $tax_name; ?>">
@@ -282 +283 @@
     <div class="nojs-tags hide-if-js">
     <p><?php echo $taxonomy->labels->add_or_remove_items; ?></p>
-    <textarea name="<?php echo "tax_input[$tax_name]"; ?>" rows="3" cols="20" class="the-tags" id="tax-input-<?php echo $tax_name; ?>" <?php echo $disabled; ?>><?php echo get_terms_to_edit( $post->ID, $tax_name ); // textarea_escaped by esc_attr() ?></textarea></div>
+    <textarea name="<?php echo "tax_input[$tax_name]"; ?>" rows="3" cols="20" class="the-tags" id="tax-input-<?php echo $tax_name; ?>" <?php echo $disabled; ?>><?php echo str_replace( ',', $comma . ' ', get_terms_to_edit( $post->ID, $tax_name ) ); // textarea_escaped by esc_attr() ?></textarea></div>
     <?php if ( current_user_can($taxonomy->cap->assign_terms) ) : ?>
     <div class="ajaxtag hide-if-no-js">

trunk/wp-admin/includes/post.php

@@ -303 +303 @@
                 continue;
             if ( is_taxonomy_hierarchical( $tax_name ) ) {
-                $tax_input[$tax_name] = array_map( 'absint', $terms );
+                $tax_input[ $tax_name ] = array_map( 'absint', $terms );
             } else {
-                $tax_input[$tax_name] = preg_replace( '/\s*,\s*/', ',', rtrim( trim($terms), ' ,' ) );
-                $tax_input[$tax_name] = explode(',', $tax_input[$tax_name]);
+                $comma = _x( ',', 'tag delimiter' );
+                if ( ',' !== $comma )
+                    $terms = str_replace( $comma, ',', $terms );
+                $tax_input[ $tax_name ] = explode( ',', trim( $terms, " \n\t\r\0\x0B," ) );
             }
         }

trunk/wp-admin/includes/template.php

@@ -265 +265 @@
         $taxonomy = get_taxonomy( $taxonomy_name );
 
-        if ( $taxonomy->hierarchical && $taxonomy->show_ui )
-                echo '<div class="post_category" id="'.$taxonomy_name.'_'.$post->ID.'">' . implode( ',', wp_get_object_terms( $post->ID, $taxonomy_name, array('fields'=>'ids')) ) . '</div>';
-        elseif ( $taxonomy->show_ui )
-            echo '<div class="tags_input" id="'.$taxonomy_name.'_'.$post->ID.'">' . esc_html( str_replace( ',', ', ', get_terms_to_edit($post->ID, $taxonomy_name) ) ) . '</div>';
+        if ( $taxonomy->hierarchical && $taxonomy->show_ui ) {
+                echo '<div class="post_category" id="' . $taxonomy_name . '_' . $post->ID . '">'
+                    . implode( ',', wp_get_object_terms( $post->ID, $taxonomy_name, array( 'fields' => 'ids' ) ) ) . '</div>';
+        } elseif ( $taxonomy->show_ui ) {
+            echo '<div class="tags_input" id="'.$taxonomy_name.'_'.$post->ID.'">'
+                . esc_html( str_replace( ',', ', ', get_terms_to_edit( $post->ID, $taxonomy_name ) ) ) . '</div>';
+        }
     }
 

trunk/wp-admin/js/inline-edit-post.dev.js

@@ -118 +118 @@
             // support multi taxonomies?
             tax = 'post_tag';
-            $('tr.inline-editor textarea[name="tax_input['+tax+']"]').suggest( 'admin-ajax.php?action=ajax-tag-search&tax='+tax, { delay: 500, minchars: 2, multiple: true, multipleSep: ", " } );
+            $('tr.inline-editor textarea[name="tax_input['+tax+']"]').suggest( 'admin-ajax.php?action=ajax-tag-search&tax='+tax, { delay: 500, minchars: 2, multiple: true, multipleSep: inlineEditL10n.comma + ' ' } );
         }
         $('html, body').animate( { scrollTop: 0 }, 'fast' );
@@ -185 +185 @@
             var terms = $(this).text(),
                 taxname = $(this).attr('id').replace('_' + id, ''),
-                textarea = $('textarea.tax_input_' + taxname, editRow);
-
-            if ( terms )
+                textarea = $('textarea.tax_input_' + taxname, editRow),
+                comma = inlineEditL10n.comma;
+
+            if ( terms ) {
+                if ( ',' !== comma )
+                    terms = terms.replace(/,/g, comma);
                 textarea.val(terms);
-
-            textarea.suggest( 'admin-ajax.php?action=ajax-tag-search&tax='+taxname, { delay: 500, minchars: 2, multiple: true, multipleSep: ", " } );
+            }
+
+            textarea.suggest( 'admin-ajax.php?action=ajax-tag-search&tax='+taxname, { delay: 500, minchars: 2, multiple: true, multipleSep: inlineEditL10n.comma + ' ' } );
         });
 

trunk/wp-admin/js/post.dev.js

@@ -16 +16 @@
 tagBox = {
     clean : function(tags) {
-        return tags.replace(/\s*,\s*/g, ',').replace(/,+/g, ',').replace(/[,\s]+$/, '').replace(/^[,\s]+/, '');
+        var comma = postL10n.comma;
+        if ( ',' !== comma )
+            tags = tags.replace(new RegExp(comma, 'g'), ',');
+        tags = tags.replace(/\s*,\s*/g, ',').replace(/,+/g, ',').replace(/[,\s]+$/, '').replace(/^[,\s]+/, '');
+        if ( ',' !== comma )
+            tags = tags.replace(/,/g, comma);
+        return tags;
     },
 
     parseTags : function(el) {
-        var id = el.id, num = id.split('-check-num-')[1], taxbox = $(el).closest('.tagsdiv'), thetags = taxbox.find('.the-tags'), current_tags = thetags.val().split(','), new_tags = [];
+        var id = el.id, num = id.split('-check-num-')[1], taxbox = $(el).closest('.tagsdiv'),
+            thetags = taxbox.find('.the-tags'), comma = postL10n.comma,
+            current_tags = thetags.val().split(comma), new_tags = [];
         delete current_tags[num];
 
@@ -30 +38 @@
         });
 
-        thetags.val( this.clean( new_tags.join(',') ) );
+        thetags.val( this.clean( new_tags.join(comma) ) );
 
         this.quickClicks(taxbox);
@@ -47 +55 @@
         disabled = thetags.prop('disabled');
 
-        current_tags = thetags.val().split(',');
+        current_tags = thetags.val().split(postL10n.comma);
         tagchecklist.empty();
 
@@ -75 +83 @@
     flushTags : function(el, a, f) {
         a = a || false;
-        var text, tags = $('.the-tags', el), newtag = $('input.newtag', el), newtags;
+        var tags = $('.the-tags', el),
+            newtag = $('input.newtag', el),
+            comma = postL10n.comma,
+            newtags, text;
 
         text = a ? $(a).text() : newtag.val();
         tagsval = tags.val();
-        newtags = tagsval ? tagsval + ',' + text : text;
+        newtags = tagsval ? tagsval + comma + text : text;
 
         newtags = this.clean( newtags );
-        newtags = array_unique_noempty( newtags.split(',') ).join(',');
+        newtags = array_unique_noempty( newtags.split(comma) ).join(comma);
         tags.val(newtags);
         this.quickClicks(el);
@@ -97 +108 @@
         var tax = id.substr(id.indexOf('-')+1);
 
-        $.post(ajaxurl, {'action':'get-tagcloud','tax':tax}, function(r, stat) {
+        $.post(ajaxurl, {'action':'get-tagcloud', 'tax':tax}, function(r, stat) {
             if ( 0 == r || 'success' != stat )
                 r = wpAjax.broken;
@@ -143 +154 @@
         }).each(function(){
             var tax = $(this).closest('div.tagsdiv').attr('id');
-            $(this).suggest( ajaxurl + '?action=ajax-tag-search&tax=' + tax, { delay: 500, minchars: 2, multiple: true, multipleSep: "," } );
+            $(this).suggest( ajaxurl + '?action=ajax-tag-search&tax=' + tax, { delay: 500, minchars: 2, multiple: true, multipleSep: postL10n.comma + ' ' } );
         });
 

trunk/wp-includes/post.php

@@ -2908 +2908 @@
         $tags = array();
 
-    $tags = is_array($tags) ? $tags : explode( ',', trim($tags, " \n\t\r\0\x0B,") );
+    if ( ! is_array( $tags ) ) {
+        $comma = _x( ',', 'tag delimiter' );
+        if ( ',' !== $comma )
+            $tags = str_replace( $comma, ',', $tags );
+        $tags = explode( ',', trim( $tags, " \n\t\r\0\x0B," ) );
+    }
 
     // Hierarchical taxonomies must always pass IDs rather than names so that children with the same

trunk/wp-includes/script-loader.php

@@ -331 +331 @@
             'password' => __('Password Protected'),
             'privatelyPublished' => __('Privately Published'),
-            'published' => __('Published')
+            'published' => __('Published'),
+            'comma' => _x( ',', 'tag delimiter' ),
         ) );
 
@@ -354 +355 @@
             'error' => __('Error while saving the changes.'),
             'ntdeltitle' => __('Remove From Bulk Edit'),
-            'notitle' => __('(no title)')
+            'notitle' => __('(no title)'),
+            'comma' => _x( ',', 'tag delimiter' ),
         ) );