Changeset 48394

Timestamp:

07/07/2020 06:28:41 PM (6 years ago)

Author:

ocean90

Message:

I18N: Use wp.i18n for translatable strings in wp-admin/js/nav-menu.js.

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

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

Location:

trunk/src

Files:

• js/_enqueues/lib/nav-menu.js (modified) (5 diffs)
• wp-includes/script-loader.php (modified) (1 diff)

trunk/src/js/_enqueues/lib/nav-menu.js

@@ -10 +10 @@
  */
 
-/* global menus, postboxes, columns, isRtl, navMenuL10n, ajaxurl, wpNavMenu */
+/* global menus, postboxes, columns, isRtl, ajaxurl, wpNavMenu */
 
 (function($) {
@@ -589 +589 @@
                                         titleEl.text( title ).removeClass( 'no-title' );
                                 } else {
-                                        titleEl.text( navMenuL10n.untitled ).addClass( 'no-title' );
+                                        titleEl.text( wp.i18n._x( '(no label)', 'missing menu item navigation label' ) ).addClass( 'no-title' );
                                 }
                         } );
@@ -1051 +1051 @@
                                 window.onbeforeunload = function(){
                                         if ( api.menusChanged )
-                                                return navMenuL10n.saveAlert;
+                                                return wp.i18n.__( 'The changes you made will be lost if you navigate away from this page.' );
                                 };
                         } else {
@@ -1221 +1221 @@
                 eventOnClickMenuDelete : function() {
                         // Delete warning AYS.
-                        if ( window.confirm( navMenuL10n.warnDeleteMenu ) ) {
+                        if ( window.confirm( wp.i18n.__( 'You are about to permanently delete this menu.\n\'Cancel\' to stop, \'OK\' to delete.' ) ) ) {
                                 window.onbeforeunload = null;
                                 return true;
@@ -1254 +1254 @@
 
                         if( ! $items.length ) {
-                                $('.categorychecklist', panel).html( '<li><p>' + navMenuL10n.noResultsFound + '</p></li>' );
+                                $('.categorychecklist', panel).html( '<li><p>' + wp.i18n.__( 'No results found.' ) + '</p></li>' );
                                 $( '.spinner', panel ).removeClass( 'is-active' );
                                 wrapper.addClass( 'has-no-menu-item' );

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

@@ -1313 +1313 @@
                  */
                 $scripts->add( 'nav-menu', "/wp-admin/js/nav-menu$suffix.js", array( 'jquery-ui-sortable', 'jquery-ui-draggable', 'jquery-ui-droppable', 'wp-lists', 'postbox', 'json2', 'underscore' ) );
-                did_action( 'init' ) && $scripts->localize(
-                        'nav-menu',
-                        'navMenuL10n',
-                        array(
-                                'noResultsFound' => __( 'No results found.' ),
-                                'warnDeleteMenu' => __( "You are about to permanently delete this menu. \n 'Cancel' to stop, 'OK' to delete." ),
-                                'saveAlert'      => __( 'The changes you made will be lost if you navigate away from this page.' ),
-                                'untitled'       => _x( '(no label)', 'missing menu item navigation label' ),
-                        )
-                );
+                $scripts->set_translations( 'nav-menu' );
 
                 $scripts->add( 'custom-header', '/wp-admin/js/custom-header.js', array( 'jquery-masonry' ), false, 1 );