Ticket #7897: arabic-comma.diff

wp-includes/script-loader.php

@@ -81 +81 @@
                 'enterURL' => __('Enter the URL'),
                 'enterImageURL' => __('Enter the URL of the image'),
                 'enterImageDescription' => __('Enter a description of the image'),
-                'l10n_print_after' => 'try{convertEntities(quicktagsL10n);}catch(e){};'
+                'l10n_print_after' => 'try{convertEntities(quicktagsL10n);}catch(e){};',
+                'comma' => __(',')
         ) );
 
         $scripts->add( 'colorpicker', "/wp-includes/js/colorpicker$suffix.js", array('prototype'), '3517m' );

wp-admin/admin-ajax.php

@@ -56 +56 @@
         else
                 die('0');
 
-        if ( false !== strpos( $s, ',' ) ) {
-                $s = explode( ',', $s );
+        $comma = __(',');
+        if ( false !== strpos( $s, $comma ) ) {
+                $s = explode( $comma, $s );
                 $s = $s[count( $s ) - 1];
         }
         $s = trim( $s );

wp-admin/js/post.dev.js

@@ -10 +10 @@
 }
 
 function new_tag_remove_tag() {
-        var id = jQuery( this ).attr( 'id' ), num = id.split('-check-num-')[1], taxbox = jQuery(this).parents('.tagsdiv'), current_tags = taxbox.find( '.the-tags' ).val().split(','), new_tags = [];
+        var c = quicktagsL10n.comma;
+        var id = jQuery( this ).attr( 'id' ), num = id.split('-check-num-')[1], taxbox = jQuery(this).parents('.tagsdiv'), current_tags = taxbox.find( '.the-tags' ).val().split(c), new_tags = [];
         delete current_tags[num];
 
         jQuery.each( current_tags, function(key, val) {
@@ -20 +21 @@
                 }
         });
 
-        taxbox.find('.the-tags').val( new_tags.join(',').replace(/\s*,+\s*/, ',').replace(/,+/, ',').replace(/,+\s+,+/, ',').replace(/,+\s*$/, '').replace(/^\s*,+/, '') );
+        taxbox.find('.the-tags').val(eval("new_tags.join(quicktagsL10n.comma).replace(/\s+,+\s*/g, ',').replace(/,+/g, ',').replace(/,+\s+,+/g, ',').replace(/,+\s*$/g, '').replace(/^\s*,+/g, '')".replace(/','/g, "'"+c+"'").replace(/,[^ ]/g, c)));
 
         tag_update_quickclicks(taxbox);
         return false;
@@ -30 +31 @@
         if ( jQuery(taxbox).find('.the-tags').length == 0 )
                 return;
 
-        var current_tags = jQuery(taxbox).find('.the-tags').val().split(',');
+        var current_tags = jQuery(taxbox).find('.the-tags').val().split(quicktagsL10n.comma);
         jQuery(taxbox).find('.tagchecklist').empty();
         shown = false;
 
@@ -52 +53 @@
 function tag_flush_to_text(id, a) {
         a = a || false;
         var taxbox, text, tags, newtags;
+        var c = quicktagsL10n.comma;
 
         taxbox = jQuery('#'+id);
         text = a ? jQuery(a).text() : taxbox.find('input.newtag').val();
@@ -61 +63 @@
                 return false;
 
         tags = taxbox.find('.the-tags').val();
-        newtags = tags ? tags + ',' + text : text;
+        newtags = tags ? tags + c + text : text;
 
         // massage
-        newtags = newtags.replace(/\s+,+\s*/g, ',').replace(/,+/g, ',').replace(/,+\s+,+/g, ',').replace(/,+\s*$/g, '').replace(/^\s*,+/g, '');
-        newtags = array_unique_noempty(newtags.split(',')).join(',');
+        newtags = eval("newtags.replace(/\s+,+\s*/g, ',').replace(/,+/g, ',').replace(/,+\s+,+/g, ',').replace(/,+\s*$/g, '').replace(/^\s*,+/g, '')".replace(/','/g, "'"+c+"'").replace(/,[^ ]/g, c));
+        newtags = array_unique_noempty(newtags.split(c)).join(c);
         taxbox.find('.the-tags').val(newtags);
         tag_update_quickclicks(taxbox);