Changeset 14614 for trunk/wp-includes/taxonomy.php

Timestamp:

05/14/2010 12:34:04 AM (15 years ago)

Author:

nbachiyski

Message:

I18n for custom taxonomies. Fixes #13357

File:

• trunk/wp-includes/taxonomy.php (modified) (9 diffs)

trunk/wp-includes/taxonomy.php

@@ -19 +19 @@
         'hierarchical' => true,
         'update_count_callback' => '_update_post_term_count',
-        'label' => __( 'Categories' ),
-        'singular_label' => __( 'Category' ),
         'query_var' => false,
         'rewrite' => false,
@@ -31 +29 @@
         'hierarchical' => false,
         'update_count_callback' => '_update_post_term_count',
-        'label' => __( 'Post Tags' ),
-        'singular_label' => __( 'Post Tag' ),
         'query_var' => false,
         'rewrite' => false,
@@ -42 +38 @@
     register_taxonomy( 'nav_menu', 'nav_menu_item', array(
         'hierarchical' => false,
-        'label' => __( 'Navigation Menus' ),
-        'singular_label' => __( 'Navigation Menu' ),
+        'labels' => array(
+            'name' => __( 'Navigation Menus' ),
+            'singular_name' => __( 'Navigation Menu' ),
+        ),
         'query_var' => false,
         'rewrite' => false,
@@ -52 +50 @@
     register_taxonomy( 'link_category', 'link', array(
         'hierarchical' => false,
-        'label' => __( 'Categories' ),
+        'labels' => array(
+            'name' => __( 'Categories' ),
+            'singular_name' => __( 'Category' ),
+        ),
         'query_var' => false,
         'rewrite' => false,
@@ -231 +232 @@
  * show_tagcloud - false to prevent the taxonomy being listed in the Tag Cloud Widget;
  * defaults to show_ui which defalts to public.
+ * 
+ * labels - An array of labels for this taxonomy. You can see accepted values in {@link get_taxonomy_labels()}. By default tag labels are used for non-hierarchical types and category labels for hierarchical ones.
  *
  * @package WordPress
@@ -255 +258 @@
                         'public' => true,
                         'show_ui' => null,
-                        'label' => null,
                         'show_tagcloud' => null,
                         '_builtin' => false,
+                        'labels' => array(),
                         'capabilities' => array(),
-                        );
+                    );
     $args = wp_parse_args($args, $defaults);
 
@@ -283 +286 @@
     if ( is_null($args['show_tagcloud']) )
         $args['show_tagcloud'] = $args['show_ui'];
-
-    if ( is_null($args['label'] ) )
-        $args['label'] = $taxonomy;
 
     $default_caps = array(
@@ -296 +296 @@
     unset( $args['capabilities'] );
 
-    if ( empty($args['singular_label']) )
-        $args['singular_label'] = $args['label'];
-
     $args['name'] = $taxonomy;
     $args['object_type'] = (array) $object_type;
+    $args['labels'] = get_taxonomy_labels( (object) $args );
+    
+    // we keep these two only for backwards compatibility
+    // TODO: remove in 3.1  
+    $args['label'] = $args['labels']->name;
+    $args['singular_label'] = $args['labels']->singular_name;
+    
     $wp_taxonomies[$taxonomy] = (object) $args;
 
     // register callback handling for metabox
     add_filter('wp_ajax_add-'.$taxonomy, '_wp_ajax_add_hierarchical_term');
+}
+
+/**
+ * Builds an object with all taxonomy labels out of a taxonomy object
+ * 
+ * Accepted keys of the label array in the taxonomy object:
+ * - name - general name for the taxonomy, usually plural. Default is Post Tags/Categories
+ * - singular_name - name for one object of this taxonomy. Default is Post Tag/Category
+ * - search_items - Default is Search Tags/Search Categories
+ * - popular_items - Default is Popular Tags/Popular Categories
+ * - all_items - Default is All Tags/All Categories
+ * - parent_item - This string isn't used on non-hierarchical taxonomies. In hierarchical ones the default is Parent Category
+ * - parent_item_colon - The same as <code>parent_item</code>, but with colon <code>:</code> in the end
+ * - edit_item - Default is Edit Tag/Edit Category
+ * - update_item - Default is Update Tag/Update Category
+ * - add_new_item - Default is Add New Tag/Add New Category
+ * - new_item_name - Default is New Tag Name/New Category Name
+ * 
+ * Above, the first default value is for non-hierarchical taxonomies (like tags) and the second one is for hierarchical taxonomies (like categories.)
+ * 
+ * @since 3.0.0
+ * @param object $tax Taxonomy object
+ * @return object object with all the labels as member variables
+ */
+
+function get_taxonomy_labels( $tax ) {
+    $nohier_vs_hier_defaults = array(
+        'name' => array( _x( 'Post Tags', 'taxonomy general name' ), _x( 'Categories', 'taxonomy general name' ) ),
+        'singular_name' => array( _x( 'Post Tag', 'taxonomy singular name' ), _x( 'Category', 'taxonomy singular name' ) ),
+        'search_items' => array( __( 'Search Tags' ), __( 'Search Categories' ) ),
+        'popular_items' => array( __( 'Popular Tags' ), __( 'Popular Category' ) ),
+        'all_items' => array( __( 'All Tags' ), __( 'All Categories' ) ),
+        'parent_item' => array( null, __( 'Parent Category' ) ),
+        'parent_item_colon' => array( null, __( 'Parent Category:' ) ),
+        'edit_item' => array( __( 'Edit Tag' ), __( 'Edit Category' ) ),
+        'update_item' => array( __( 'Update Tag' ), __( 'Update Category' ) ),
+        'add_new_item' => array( __( 'Add New Tag' ), __( 'Add New Category' ) ),
+        'new_item_name' => array( __( 'New Tag Name' ), __( 'New Category Name' ) ),
+    );
+
+    return _get_custom_object_labels( $tax, $nohier_vs_hier_defaults );
 }
 
@@ -2613 +2658 @@
     return false;
 }
-
-
-?>