Changeset 41987

Timestamp:

10/24/2017 11:21:47 AM (7 years ago)

Author:

SergeyBiryukov

Message:

Taxonomy: After [40984], add the most_used label for non-hierarchical taxonomies too, and use it on the Menus screen.

Props johnbillion.
Fixes #41150.

Location:

trunk/src

Files:

• wp-admin/includes/meta-boxes.php (modified) (1 diff)
• wp-admin/includes/nav-menu.php (modified) (2 diffs)
• wp-includes/taxonomy.php (modified) (2 diffs)

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

@@ -999 +999 @@
     <ul id="category-tabs" class="category-tabs">
         <li class="tabs"><a href="#categories-all"><?php _e( 'All Categories' ); ?></a></li>
-        <li class="hide-if-no-js"><a href="#categories-pop"><?php _e( 'Most Used' ); ?></a></li>
+        <li class="hide-if-no-js"><a href="#categories-pop"><?php _ex( 'Most Used', 'categories' ); ?></a></li>
     </ul>
 

trunk/src/wp-admin/includes/nav-menu.php

@@ -608 +608 @@
     global $nav_menu_selected_id;
     $taxonomy_name = $box['args']->name;
+    $taxonomy = get_taxonomy( $taxonomy_name );
 
     // Paginate browsing for large numbers of objects.
@@ -683 +684 @@
             <li <?php echo ( 'most-used' == $current_tab ? ' class="tabs"' : '' ); ?>>
                 <a class="nav-tab-link" data-type="tabs-panel-<?php echo esc_attr( $taxonomy_name ); ?>-pop" href="<?php if ( $nav_menu_selected_id ) echo esc_url(add_query_arg($taxonomy_name . '-tab', 'most-used', remove_query_arg($removed_args))); ?>#tabs-panel-<?php echo $taxonomy_name; ?>-pop">
-                    <?php _e( 'Most Used' ); ?>
+                    <?php echo esc_html( $taxonomy->labels->most_used ); ?>
                 </a>
             </li>

trunk/src/wp-includes/taxonomy.php

@@ -489 +489 @@
  *     @type string $items_list_navigation      Label for the table pagination hidden heading.
  *     @type string $items_list                 Label for the table hidden heading.
- *     @type string $most_used                  Title used for the Most Used panel. Not used for non-hierarchical
- *                                              taxonomies. Default 'Most Used'.
+ *     @type string $most_used                  Title for the Most Used tab. Default 'Most Used'.
  *     @type string $back_to_items              Label displayed after a term has been updated.
  * }
@@ -524 +523 @@
         'items_list' => array( __( 'Tags list' ), __( 'Categories list' ) ),
         /* translators: Tab heading when selecting from the most used terms */
-        'most_used' => array( null, _x( 'Most Used', 'Most used categories' ) ),
+        'most_used' => array( _x( 'Most Used', 'tags' ), _x( 'Most Used', 'categories' ) ),
         'back_to_items' => array( __( '← Back to Tags' ), __( '← Back to Categories' ) ),
     );