Changeset 14571 for trunk/wp-includes/nav-menu.php

Timestamp:

05/11/2010 07:52:50 PM (16 years ago)

Author:

nbachiyski

Message:

I18n for custom post type labels. Props demetris, dimadin. Fixes #12968

File:

• trunk/wp-includes/nav-menu.php (modified) (8 diffs)

trunk/wp-includes/nav-menu.php

@@ -232 +232 @@
                 'menu-item-position' => 0,
                 'menu-item-type' => 'custom',
-                'menu-item-append' => 'custom',
                 'menu-item-title' => '',
                 'menu-item-url' => '',
@@ -278 +277 @@
 
                         if ( 'trash' == get_post_status( $args['menu-item-object-id'] ) ) {
-                                $post_type_object = get_post_type_object( $args['menu-item-object'] );
-                                if ( isset( $post_type_object->singular_label ) )
-                                        return new WP_Error('update_nav_menu_item_failed', sprintf(__('The menu item "%1$s" belongs to a %2$s that is in the trash, so it cannot be updated.'), $args['menu-item-title'], $post_type_object->singular_label ) );
-                                else
-                                        return new WP_Error('update_nav_menu_item_failed', sprintf(__('The menu item "%1$s" belongs to something that is in the trash, so it cannot be updated.'), $args['menu-item-title'] ) );
+                                return new WP_Error('update_nav_menu_item_failed', sprintf(__('The menu item "%1$s" belongs to something that is in the trash, so it cannot be updated.'), $args['menu-item-title'] ) );
                         }
                 }
@@ -486 +481 @@
  * - type:              The family of objects originally represented, such as "post_type" or "taxonomy."
  * - object:            The type of object originally represented, such as "category," "post", or "attachment."
- * - append:            The singular label used to describe this type of menu item.
+ * - type_label:        The singular label used to describe this type of menu item.
  * - post_parent:       The DB ID of the original object's parent object, if any (0 otherwise).
  * - menu_item_parent:  The DB ID of the nav_menu_item that is this item's menu parent, if any.  0 otherwise.
@@ -513 +508 @@
                         if ( 'post_type' == $menu_item->type ) {
                                 $object = get_post_type_object( $menu_item->object );
-                                $menu_item->append = $object->singular_label;
+                                $menu_item->type_label = $object->labels->singular_name;
                                 $menu_item->url = get_permalink( $menu_item->object_id );
 
@@ -522 +517 @@
                         } elseif ( 'taxonomy' == $menu_item->type ) {
                                 $object = get_taxonomy( $menu_item->object );
-                                $menu_item->append = $object->singular_label;
+                                $menu_item->type_label = $object->singular_label;
                                 $menu_item->url = get_term_link( (int) $menu_item->object_id, $menu_item->object );
 
@@ -529 +524 @@
 
                         } else {
-                                $menu_item->append = __('Custom');
+                                $menu_item->type_label = __('Custom');
                                 $menu_item->title = $menu_item->post_title;
                                 $menu_item->url = get_post_meta( $menu_item->ID, '_menu_item_url', true );
@@ -549 +544 @@
                         $object = get_post_type_object( $menu_item->post_type );
                         $menu_item->object = $object->name;
-                        $menu_item->append = strtolower( $object->singular_label );
+                        $menu_item->type_label = $object->labels->singular_name;
 
                         $menu_item->title = $menu_item->post_title;
@@ -570 +565 @@
                 $object = get_taxonomy( $menu_item->taxonomy );
                 $menu_item->object = $object->name;
-                $menu_item->append = strtolower( $object->singular_label );
+                $menu_item->type_label = $object->singular_label;
 
                 $menu_item->title = $menu_item->name;