Changeset 16251

Timestamp:

11/09/2010 02:09:00 AM (14 years ago)

Author:

nacin

Message:

Introduce menu_name label for taxonomies and post types. Defaults to name. fixes #14832.

Location:

trunk

Files:

• wp-admin/menu.php (modified) (4 diffs)
• wp-includes/post.php (modified) (1 diff)
• wp-includes/taxonomy.php (modified) (1 diff)

trunk/wp-admin/menu.php

@@ -71 +71 @@
             continue;
 
-        $submenu['edit.php'][$i++] = array( esc_attr( $tax->labels->name ), $tax->cap->manage_terms, 'edit-tags.php?taxonomy=' . $tax->name );
+        $submenu['edit.php'][$i++] = array( esc_attr( $tax->labels->menu_name ), $tax->cap->manage_terms, 'edit-tags.php?taxonomy=' . $tax->name );
     }
     unset($tax);
@@ -95 +95 @@
             continue;
 
-        $submenu['edit.php?post_type=page'][$i++] = array( esc_attr( $tax->labels->name ), $tax->cap->manage_terms, 'edit-tags.php?taxonomy=' . $tax->name . '&post_type=page' );
+        $submenu['edit.php?post_type=page'][$i++] = array( esc_attr( $tax->labels->menu_name ), $tax->cap->manage_terms, 'edit-tags.php?taxonomy=' . $tax->name . '&post_type=page' );
     }
     unset($tax);
@@ -126 +126 @@
         $ptype_menu_position++;
 
-    $menu[$ptype_menu_position] = array( esc_attr( $ptype_obj->labels->name ), $ptype_obj->cap->edit_posts, "edit.php?post_type=$ptype", '', 'menu-top menu-icon-' . $ptype_class, 'menu-posts-' . $ptype_for_id, $menu_icon );
-    $submenu["edit.php?post_type=$ptype"][5]  = array( $ptype_obj->labels->name, $ptype_obj->cap->edit_posts,  "edit.php?post_type=$ptype");
+    $menu[$ptype_menu_position] = array( esc_attr( $ptype_obj->labels->menu_name ), $ptype_obj->cap->edit_posts, "edit.php?post_type=$ptype", '', 'menu-top menu-icon-' . $ptype_class, 'menu-posts-' . $ptype_for_id, $menu_icon );
+    $submenu["edit.php?post_type=$ptype"][5]  = array( $ptype_obj->labels->menu_name, $ptype_obj->cap->edit_posts,  "edit.php?post_type=$ptype");
     $submenu["edit.php?post_type=$ptype"][10]  = array( $ptype_obj->labels->add_new, $ptype_obj->cap->edit_posts, "post-new.php?post_type=$ptype" );
 
@@ -135 +135 @@
             continue;
 
-        $submenu["edit.php?post_type=$ptype"][$i++] = array( esc_attr( $tax->labels->name ), $tax->cap->manage_terms, "edit-tags.php?taxonomy=$tax->name&post_type=$ptype" );
+        $submenu["edit.php?post_type=$ptype"][$i++] = array( esc_attr( $tax->labels->menu_name ), $tax->cap->manage_terms, "edit-tags.php?taxonomy=$tax->name&post_type=$ptype" );
     }
 }

trunk/wp-includes/post.php

@@ -1143 +1143 @@
         'not_found' => array( __('No posts found.'), __('No pages found.') ),
         'not_found_in_trash' => array( __('No posts found in Trash.'), __('No pages found in Trash.') ),
-        'parent_item_colon' => array( null, __('Parent Page:') )
+        'parent_item_colon' => array( null, __('Parent Page:') ),
     );
+    $nohier_vs_hier_defaults['menu_name'] = $nohier_vs_hier_defaults['name'];
     return _get_custom_object_labels( $post_type_object, $nohier_vs_hier_defaults );
 }

trunk/wp-includes/taxonomy.php

@@ -404 +404 @@
         'choose_from_most_used' => array( __( 'Choose from the most used tags' ), null ),
     );
+    $nohier_vs_hier_defaults['menu_name'] = $nohier_vs_hier_defaults['name'];
 
     return _get_custom_object_labels( $tax, $nohier_vs_hier_defaults );