Changeset 48391

Timestamp:

07/07/2020 06:00:37 PM (4 years ago)

Author:

ocean90

Message:

I18N: Use wp.i18n for translatable strings in wp-admin/js/inline-edit-post.js and wp-admin/js/inline-edit-tax.js.

This removes the usage of wp_localize_script() for passing translations to the scripts and instead adds the translatable strings in the scripts directly through the use of wp.i18n and its utilities.

Props swissspidy, ocean90.
See #20491.
Fixes #50601.

Location:

trunk/src

Files:

• js/_enqueues/admin/inline-edit-post.js (modified) (5 diffs)
• js/_enqueues/admin/inline-edit-tax.js (modified) (3 diffs)
• wp-includes/script-loader.php (modified) (1 diff)

trunk/src/js/_enqueues/admin/inline-edit-post.js

@@ -6 +6 @@
  */
 
-/* global inlineEditL10n, ajaxurl, typenow, inlineEditPost */
+/* global ajaxurl, typenow, inlineEditPost */
 
 window.wp = window.wp || {};
@@ -199 +199 @@
                 c = false;
                 var id = $(this).val(), theTitle;
-                theTitle = $('#inline_'+id+' .post_title').html() || inlineEditL10n.notitle;
-                te += '<div id="ttle'+id+'"><a id="_'+id+'" class="ntdelbutton" title="'+inlineEditL10n.ntdeltitle+'">X</a>'+theTitle+'</div>';
+                theTitle = $('#inline_'+id+' .post_title').html() || wp.i18n.__( '(no title)' );
+                te += '<div id="ttle'+id+'"><a id="_'+id+'" class="ntdelbutton" title="'+ wp.i18n.__( 'Remove From Bulk Edit' ) +'">X</a>'+theTitle+'</div>';
             }
         });
@@ -328 +328 @@
                 taxname = $(this).attr('id').replace('_' + id, ''),
                 textarea = $('textarea.tax_input_' + taxname, editRow),
-                comma = inlineEditL10n.comma;
+                comma = wp.i18n._x( ',', 'tag delimiter' ).trim();
 
             terms.find( 'img' ).replaceWith( function() { return this.alt; } );
@@ -432 +432 @@
                                 .attr( 'aria-expanded', 'false' )
                                 .focus();
-                            wp.a11y.speak( inlineEditL10n.saved );
+                            wp.a11y.speak( wp.i18n.__( 'Changes saved.' ) );
                         });
                     } else {
@@ -442 +442 @@
                 } else {
                     $errorNotice.removeClass( 'hidden' );
-                    $error.html( inlineEditL10n.error );
-                    wp.a11y.speak( inlineEditL10n.error );
+                    $error.text( wp.i18n.__( 'Error while saving the changes.' ) );
+                    wp.a11y.speak( wp.i18n.__( 'Error while saving the changes.' ) );
                 }
             },

trunk/src/js/_enqueues/admin/inline-edit-tax.js

@@ -5 +5 @@
  */
 
-/* global inlineEditL10n, ajaxurl, inlineEditTax */
+/* global ajaxurl, inlineEditTax */
 
 window.wp = window.wp || {};
@@ -225 +225 @@
                                 .attr( 'aria-expanded', 'false' )
                                 .focus();
-                            wp.a11y.speak( inlineEditL10n.saved );
+                            wp.a11y.speak( wp.i18n.__( 'Changes saved.' ) );
                         });
 
@@ -239 +239 @@
                 } else {
                     $errorNotice.removeClass( 'hidden' );
-                    $error.html( inlineEditL10n.error );
-                    wp.a11y.speak( inlineEditL10n.error );
+                    $error.text( wp.i18n.__( 'Error while saving the changes.' ) );
+                    wp.a11y.speak( wp.i18n.__( 'Error while saving the changes.' ) );
                 }
             }

trunk/src/wp-includes/script-loader.php

@@ -1255 +1255 @@
 
         $scripts->add( 'inline-edit-post', "/wp-admin/js/inline-edit-post$suffix.js", array( 'jquery', 'tags-suggest', 'wp-a11y' ), false, 1 );
-        did_action( 'init' ) && $scripts->localize(
-            'inline-edit-post',
-            'inlineEditL10n',
-            array(
-                'error'      => __( 'Error while saving the changes.' ),
-                'ntdeltitle' => __( 'Remove From Bulk Edit' ),
-                'notitle'    => __( '(no title)' ),
-                'comma'      => trim( _x( ',', 'tag delimiter' ) ),
-                'saved'      => __( 'Changes saved.' ),
-            )
-        );
+        $scripts->set_translations( 'inline-edit-post' );
 
         $scripts->add( 'inline-edit-tax', "/wp-admin/js/inline-edit-tax$suffix.js", array( 'jquery', 'wp-a11y' ), false, 1 );
-        did_action( 'init' ) && $scripts->localize(
-            'inline-edit-tax',
-            'inlineEditL10n',
-            array(
-                'error' => __( 'Error while saving the changes.' ),
-                'saved' => __( 'Changes saved.' ),
-            )
-        );
+        $scripts->set_translations( 'inline-edit-tax' );
 
         $scripts->add( 'plugin-install', "/wp-admin/js/plugin-install$suffix.js", array( 'jquery', 'jquery-ui-core', 'thickbox' ), false, 1 );