Changeset 41868

Timestamp:

10/15/2017 10:22:59 PM (7 years ago)

Author:

westonruter

Message:

Widgets: Rename "Custom Menu" widget to "Navigation Menu".

Props gk.loveweb, ChrisHardie, ajayghaghretiya1, melchoyce.
Fixes #40442.

Location:

trunk/src

Files:

• wp-admin/js/customize-nav-menus.js (modified) (4 diffs)
• wp-admin/nav-menus.php (modified) (2 diffs)
• wp-includes/class-wp-customize-nav-menus.php (modified) (3 diffs)
• wp-includes/class-wp-customize-widgets.php (modified) (1 diff)
• wp-includes/js/customize-selective-refresh.js (modified) (1 diff)
• wp-includes/widgets/class-wp-nav-menu-widget.php (modified) (8 diffs)

trunk/src/wp-admin/js/customize-nav-menus.js

@@ -2460 +2460 @@
             this._setupTitle();
 
-            // Add menu to Custom Menu widgets.
+            // Add menu to Navigation Menu widgets.
             if ( menu ) {
                 name = displayNavMenuName( menu.name );
@@ -2510 +2510 @@
                     control._handleDeletion();
                 } else {
-                    // Update names in the Custom Menu widgets.
+                    // Update names in the Navigation Menu widgets.
                     name = displayNavMenuName( to.name );
                     api.control.each( function( widgetControl ) {
@@ -2652 +2652 @@
             });
 
-            // Remove the menu from any Custom Menu widgets.
+            // Remove the menu from any Navigation Menu widgets.
             api.control.each(function( widgetControl ) {
                 if ( ! widgetControl.extended( api.controlConstructor.widget_form ) || 'nav_menu' !== widgetControl.params.widget_id_base ) {
@@ -3064 +3064 @@
                 api.section.add( newSection );
 
-                // Update the values for nav menus in Custom Menu controls.
+                // Update the values for nav menus in Navigation Menu controls.
                 api.control.each( function( setting ) {
                     if ( ! setting.extended( api.controlConstructor.widget_form ) || 'nav_menu' !== setting.params.widget_id_base ) {

trunk/src/wp-admin/nav-menus.php

@@ -515 +515 @@
 
 if ( ! current_theme_supports( 'menus' ) && ! $num_locations )
-    $messages[] = '<div id="message" class="updated"><p>' . sprintf( __( 'Your theme does not natively support menus, but you can use them in sidebars by adding a &#8220;Custom Menu&#8221; widget on the <a href="%s">Widgets</a> screen.' ), admin_url( 'widgets.php' ) ) . '</p></div>';
+    $messages[] = '<div id="message" class="updated"><p>' . sprintf( __( 'Your theme does not natively support menus, but you can use them in sidebars by adding a &#8220;Navigation Menu&#8221; widget on the <a href="%s">Widgets</a> screen.' ), admin_url( 'widgets.php' ) ) . '</p></div>';
 
 if ( ! $locations_screen ) : // Main tab
-    $overview  = '<p>' . __( 'This screen is used for managing your custom navigation menus.' ) . '</p>';
+    $overview  = '<p>' . __( 'This screen is used for managing your navigation menus.' ) . '</p>';
     /* translators: 1: Widgets admin screen URL, 2 and 3: The name of the default themes */
-    $overview .= '<p>' . sprintf( __( 'Menus can be displayed in locations defined by your theme, even used in sidebars by adding a &#8220;Custom Menu&#8221; widget on the <a href="%1$s">Widgets</a> screen. If your theme does not support the custom menus feature (the default themes, %2$s and %3$s, do), you can learn about adding this support by following the Documentation link to the side.' ), admin_url( 'widgets.php' ), 'Twenty Sixteen', 'Twenty Seventeen' ) . '</p>';
+    $overview .= '<p>' . sprintf( __( 'Menus can be displayed in locations defined by your theme, even used in sidebars by adding a &#8220;Navigation Menu&#8221; widget on the <a href="%1$s">Widgets</a> screen. If your theme does not support the navigation menus feature (the default themes, %2$s and %3$s, do), you can learn about adding this support by following the Documentation link to the side.' ), admin_url( 'widgets.php' ), 'Twenty Sixteen', 'Twenty Seventeen' ) . '</p>';
     $overview .= '<p>' . __( 'From this screen you can:' ) . '</p>';
     $overview .= '<ul><li>' . __( 'Create, edit, and delete menus' ) . '</li>';
@@ -542 +542 @@
     ) );
 
-    $editing_menus  = '<p>' . __( 'Each custom menu may contain a mix of links to pages, categories, custom URLs or other content types. Menu links are added by selecting items from the expanding boxes in the left-hand column below.' ) . '</p>';
+    $editing_menus  = '<p>' . __( 'Each navigation menu may contain a mix of links to pages, categories, custom URLs or other content types. Menu links are added by selecting items from the expanding boxes in the left-hand column below.' ) . '</p>';
     $editing_menus .= '<p>' . __( '<strong>Clicking the arrow to the right of any menu item</strong> in the editor will reveal a standard group of settings. Additional settings such as link target, CSS classes, link relationships, and link descriptions can be enabled and disabled via the Screen Options tab.' ) . '</p>';
     $editing_menus .= '<ul><li>' . __( 'Add one or several items at once by <strong>selecting the checkbox next to each item and clicking Add to Menu</strong>' ) . '</li>';

trunk/src/wp-includes/class-wp-customize-nav-menus.php

@@ -557 +557 @@
         if ( current_theme_supports( 'widgets' ) ) {
             /* translators: URL to the widgets panel of the customizer */
-            $description .= '<p>' . sprintf( __( 'Menus can be displayed in locations defined by your theme or in <a href="%s">widget areas</a> by adding a &#8220;Custom Menu&#8221; widget.' ), "javascript:wp.customize.panel( 'widgets' ).focus();" ) . '</p>';
+            $description .= '<p>' . sprintf( __( 'Menus can be displayed in locations defined by your theme or in <a href="%s">widget areas</a> by adding a &#8220;Navigation Menu&#8221; widget.' ), "javascript:wp.customize.panel( 'widgets' ).focus();" ) . '</p>';
         } else {
             $description .= '<p>' . __( 'Menus can be displayed in locations defined by your theme.' ) . '</p>';
@@ -581 +581 @@
         if ( current_theme_supports( 'widgets' ) ) {
             /* translators: URL to the widgets panel of the customizer */
-            $description .= '<p>' . sprintf( __( 'If your theme has widget areas, you can also add menus there. Visit the <a href="%s">Widgets panel</a> and add a &#8220;Custom Menu widget&#8221; to display a menu in a sidebar or footer.' ), "javascript:wp.customize.panel( 'widgets' ).focus();" ) . '</p>';
+            $description .= '<p>' . sprintf( __( 'If your theme has widget areas, you can also add menus there. Visit the <a href="%s">Widgets panel</a> and add a &#8220;Navigation Menu widget&#8221; to display a menu in a sidebar or footer.' ), "javascript:wp.customize.panel( 'widgets' ).focus();" ) . '</p>';
         }
 
@@ -762 +762 @@
          * @since 4.7.0  Each array item now includes a `$type_label` in addition to `$title`, `$type`, and `$object`.
          *
-         * @param array $item_types Custom menu item types.
+         * @param array $item_types Navigation menu item types.
          */
         $item_types = apply_filters( 'customize_nav_menu_available_item_types', $item_types );

trunk/src/wp-includes/class-wp-customize-widgets.php

@@ -1366 +1366 @@
         /*
          * Make sure that other setting changes have previewed since this widget
-         * may depend on them (e.g. Menus being present for Custom Menu widget).
+         * may depend on them (e.g. Menus being present for Navigation Menu widget).
          */
         if ( ! did_action( 'customize_preview_init' ) ) {

trunk/src/wp-includes/js/customize-selective-refresh.js

@@ -884 +884 @@
              * Only trigger renders on (nested) partials that have been not been
              * handled yet. An example where this would apply is a nav menu
-             * embedded inside of a custom menu widget. When the widget's title
+             * embedded inside of a navigation menu widget. When the widget's title
              * is updated, the entire widget will re-render and then the event
              * will be triggered for the nested nav menu to do any initialization.

trunk/src/wp-includes/widgets/class-wp-nav-menu-widget.php

@@ -9 +9 @@
 
 /**
- * Core class used to implement the Custom Menu widget.
+ * Core class used to implement the Navigation Menu widget.
  *
  * @since 3.0.0
@@ -18 +18 @@
 
     /**
-     * Sets up a new Custom Menu widget instance.
+     * Sets up a new Navigation Menu widget instance.
      *
      * @since 3.0.0
@@ -24 +24 @@
     public function __construct() {
         $widget_ops = array(
-            'description' => __( 'Add a custom menu to your sidebar.' ),
+            'description' => __( 'Add a navigation menu to your sidebar.' ),
             'customize_selective_refresh' => true,
         );
-        parent::__construct( 'nav_menu', __('Custom Menu'), $widget_ops );
+        parent::__construct( 'nav_menu', __('Navigation Menu'), $widget_ops );
     }
 
     /**
-     * Outputs the content for the current Custom Menu widget instance.
+     * Outputs the content for the current Navigation Menu widget instance.
      *
      * @since 3.0.0
@@ -37 +37 @@
      * @param array $args     Display arguments including 'before_title', 'after_title',
      *                        'before_widget', and 'after_widget'.
-     * @param array $instance Settings for the current Custom Menu widget instance.
+     * @param array $instance Settings for the current Navigation Menu widget instance.
      */
     public function widget( $args, $instance ) {
@@ -64 +64 @@
 
         /**
-         * Filters the arguments for the Custom Menu widget.
+         * Filters the arguments for the Navigation Menu widget.
          *
          * @since 4.2.0
@@ -70 +70 @@
          *
          * @param array    $nav_menu_args {
-         *     An array of arguments passed to wp_nav_menu() to retrieve a custom menu.
+         *     An array of arguments passed to wp_nav_menu() to retrieve a navigation menu.
          *
          *     @type callable|bool $fallback_cb Callback to fire if the menu doesn't exist. Default empty.
@@ -85 +85 @@
 
     /**
-     * Handles updating settings for the current Custom Menu widget instance.
+     * Handles updating settings for the current Navigation Menu widget instance.
      *
      * @since 3.0.0
@@ -106 +106 @@
 
     /**
-     * Outputs the settings form for the Custom Menu widget.
+     * Outputs the settings form for the Navigation Menu widget.
      *
      * @since 3.0.0