Changeset 5131 for trunk/bbpress.php

Timestamp:

10/17/2013 04:37:14 AM (13 years ago)

Author:

johnjamesjacoby

Message:

Use wrapper functions introduced in r5130 for custom post-types and taxonomy.

File:

• trunk/bbpress.php (modified) (6 diffs)

trunk/bbpress.php

@@ -457 +457 @@
         // Look in local /wp-content/plugins/bbpress/bbp-languages/ folder
         load_textdomain( $this->domain, $mofile_local );
+
+        // Look in global /wp-content/languages/plugins/
+        load_plugin_textdomain( $this->domain );
     }
 
@@ -469 +472 @@
     public static function register_post_types() {
 
-        // Define local variable(s)
-        $post_type = array();
-
         /** Forums ************************************************************/
-
-        // Forum labels
-        $post_type['labels'] = array(
-            'name'               => __( 'Forums',                   'bbpress' ),
-            'menu_name'          => __( 'Forums',                   'bbpress' ),
-            'singular_name'      => __( 'Forum',                    'bbpress' ),
-            'all_items'          => __( 'All Forums',               'bbpress' ),
-            'add_new'            => __( 'New Forum',                'bbpress' ),
-            'add_new_item'       => __( 'Create New Forum',         'bbpress' ),
-            'edit'               => __( 'Edit',                     'bbpress' ),
-            'edit_item'          => __( 'Edit Forum',               'bbpress' ),
-            'new_item'           => __( 'New Forum',                'bbpress' ),
-            'view'               => __( 'View Forum',               'bbpress' ),
-            'view_item'          => __( 'View Forum',               'bbpress' ),
-            'search_items'       => __( 'Search Forums',            'bbpress' ),
-            'not_found'          => __( 'No forums found',          'bbpress' ),
-            'not_found_in_trash' => __( 'No forums found in Trash', 'bbpress' ),
-            'parent_item_colon'  => __( 'Parent Forum:',            'bbpress' )
-        );
-
-        // Forum rewrite
-        $post_type['rewrite'] = array(
-            'slug'       => bbp_get_forum_slug(),
-            'with_front' => false
-        );
-
-        // Forum supports
-        $post_type['supports'] = array(
-            'title',
-            'editor',
-            'revisions'
-        );
 
         // Register Forum content type
@@ -510 +478 @@
             bbp_get_forum_post_type(),
             apply_filters( 'bbp_register_forum_post_type', array(
-                'labels'              => $post_type['labels'],
-                'rewrite'             => $post_type['rewrite'],
-                'supports'            => $post_type['supports'],
+                'labels'              => bbp_get_forum_post_type_labels(),
+                'rewrite'             => bbp_get_forum_post_type_rewrite(),
+                'supports'            => bbp_get_forum_post_type_supports(),
                 'description'         => __( 'bbPress Forums', 'bbpress' ),
                 'capabilities'        => bbp_get_forum_caps(),
@@ -531 +499 @@
         /** Topics ************************************************************/
 
-        // Topic labels
-        $post_type['labels'] = array(
-            'name'               => __( 'Topics',                   'bbpress' ),
-            'menu_name'          => __( 'Topics',                   'bbpress' ),
-            'singular_name'      => __( 'Topic',                    'bbpress' ),
-            'all_items'          => __( 'All Topics',               'bbpress' ),
-            'add_new'            => __( 'New Topic',                'bbpress' ),
-            'add_new_item'       => __( 'Create New Topic',         'bbpress' ),
-            'edit'               => __( 'Edit',                     'bbpress' ),
-            'edit_item'          => __( 'Edit Topic',               'bbpress' ),
-            'new_item'           => __( 'New Topic',                'bbpress' ),
-            'view'               => __( 'View Topic',               'bbpress' ),
-            'view_item'          => __( 'View Topic',               'bbpress' ),
-            'search_items'       => __( 'Search Topics',            'bbpress' ),
-            'not_found'          => __( 'No topics found',          'bbpress' ),
-            'not_found_in_trash' => __( 'No topics found in Trash', 'bbpress' ),
-            'parent_item_colon'  => __( 'Forum:',                   'bbpress' )
-        );
-
-        // Topic rewrite
-        $post_type['rewrite'] = array(
-            'slug'       => bbp_get_topic_slug(),
-            'with_front' => false
-        );
-
-        // Topic supports
-        $post_type['supports'] = array(
-            'title',
-            'editor',
-            'revisions'
-        );
-
         // Register Topic content type
         register_post_type(
             bbp_get_topic_post_type(),
             apply_filters( 'bbp_register_topic_post_type', array(
-                'labels'              => $post_type['labels'],
-                'rewrite'             => $post_type['rewrite'],
-                'supports'            => $post_type['supports'],
+                'labels'              => bbp_get_topic_post_type_labels(),
+                'rewrite'             => bbp_get_topic_post_type_rewrite(),
+                'supports'            => bbp_get_topic_post_type_supports(),
                 'description'         => __( 'bbPress Topics', 'bbpress' ),
                 'capabilities'        => bbp_get_topic_caps(),
@@ -588 +524 @@
         /** Replies ***********************************************************/
 
-        // Reply labels
-        $post_type['labels'] = array(
-            'name'               => __( 'Replies',                   'bbpress' ),
-            'menu_name'          => __( 'Replies',                   'bbpress' ),
-            'singular_name'      => __( 'Reply',                     'bbpress' ),
-            'all_items'          => __( 'All Replies',               'bbpress' ),
-            'add_new'            => __( 'New Reply',                 'bbpress' ),
-            'add_new_item'       => __( 'Create New Reply',          'bbpress' ),
-            'edit'               => __( 'Edit',                      'bbpress' ),
-            'edit_item'          => __( 'Edit Reply',                'bbpress' ),
-            'new_item'           => __( 'New Reply',                 'bbpress' ),
-            'view'               => __( 'View Reply',                'bbpress' ),
-            'view_item'          => __( 'View Reply',                'bbpress' ),
-            'search_items'       => __( 'Search Replies',            'bbpress' ),
-            'not_found'          => __( 'No replies found',          'bbpress' ),
-            'not_found_in_trash' => __( 'No replies found in Trash', 'bbpress' ),
-            'parent_item_colon'  => __( 'Topic:',                    'bbpress' )
-        );
-
-        // Reply rewrite
-        $post_type['rewrite'] = array(
-            'slug'       => bbp_get_reply_slug(),
-            'with_front' => false
-        );
-
-        // Reply supports
-        $post_type['supports'] = array(
-            'title',
-            'editor',
-            'revisions'
-        );
-
         // Register reply content type
         register_post_type(
             bbp_get_reply_post_type(),
             apply_filters( 'bbp_register_reply_post_type', array(
-                'labels'              => $post_type['labels'],
-                'rewrite'             => $post_type['rewrite'],
-                'supports'            => $post_type['supports'],
+                'labels'              => bbp_get_reply_post_type_labels(),
+                'rewrite'             => bbp_get_reply_post_type_rewrite(),
+                'supports'            => bbp_get_reply_post_type_supports(),
                 'description'         => __( 'bbPress Replies', 'bbpress' ),
                 'capabilities'        => bbp_get_reply_caps(),
@@ -740 +644 @@
     public static function register_taxonomies() {
 
-        // Define local variable(s)
-        $topic_tag = array();
-
-        // Topic tag labels
-        $topic_tag['labels'] = array(
-            'name'          => __( 'Topic Tags',     'bbpress' ),
-            'singular_name' => __( 'Topic Tag',      'bbpress' ),
-            'search_items'  => __( 'Search Tags',    'bbpress' ),
-            'popular_items' => __( 'Popular Tags',   'bbpress' ),
-            'all_items'     => __( 'All Tags',       'bbpress' ),
-            'edit_item'     => __( 'Edit Tag',       'bbpress' ),
-            'update_item'   => __( 'Update Tag',     'bbpress' ),
-            'add_new_item'  => __( 'Add New Tag',    'bbpress' ),
-            'new_item_name' => __( 'New Tag Name',   'bbpress' ),
-            'view_item'     => __( 'View Topic Tag', 'bbpress' )
-        );
-
-        // Topic tag rewrite
-        $topic_tag['rewrite'] = array(
-            'slug'       => bbp_get_topic_tag_tax_slug(),
-            'with_front' => false
-        );
-
-        // Register the topic tag taxonomy
+        // Register the topic-tag taxonomy
         register_taxonomy(
             bbp_get_topic_tag_tax_id(),
             bbp_get_topic_post_type(),
             apply_filters( 'bbp_register_topic_taxonomy', array(
-                'labels'                => $topic_tag['labels'],
-                'rewrite'               => $topic_tag['rewrite'],
+                'labels'                => bbp_get_topic_tag_tax_labels(),
+                'rewrite'               => bbp_get_topic_tag_tax_rewrite(),
                 'capabilities'          => bbp_get_topic_tag_caps(),
                 'update_count_callback' => '_update_post_term_count',