Ticket #6918: 6918.01.patch

src/bp-core/bp-core-customizer-email.php

@@ -31 +31 @@
 
         $wp_customize->add_panel( 'bp_mailtpl', array(
                 'description' => __( 'Customize the appearance of emails sent by BuddyPress.', 'buddypress' ),
-                'title'       => _x( 'Emails', 'screen heading', 'buddypress' ),
+                'title'       => _x( 'BuddyPress Emails', 'screen heading', 'buddypress' ),
         ) );
 
         $sections = bp_email_get_customizer_sections();

src/bp-core/bp-core-functions.php

@@ -2653 +2653 @@
          */
         return apply_filters( 'bp_get_email_post_type_labels', array(
                 'add_new'               => _x( 'Add New', 'email post type label', 'buddypress' ),
-                'add_new_item'          => _x( 'Add a New Email', 'email post type label', 'buddypress' ),
+                'add_new_item'          => _x( 'Add a New BuddyPress Email', 'email post type label', 'buddypress' ),
                 'all_items'             => _x( 'All Emails', 'email post type label', 'buddypress' ),
-                'edit_item'             => _x( 'Edit Email', 'email post type label', 'buddypress' ),
+                'edit_item'             => _x( 'Edit BuddyPress Email', 'email post type label', 'buddypress' ),
                 'filter_items_list'     => _x( 'Filter email list', 'email post type label', 'buddypress' ),
                 'items_list'            => _x( 'Email list', 'email post type label', 'buddypress' ),
                 'items_list_navigation' => _x( 'Email list navigation', 'email post type label', 'buddypress' ),
-                'name'                  => _x( 'Emails', 'email post type name', 'buddypress' ),
+                'name'                  => _x( 'BuddyPress Emails', 'email post type name', 'buddypress' ),
+                'menu_name'             => __( 'BP Emails', 'buddypress' ),
                 'new_item'              => _x( 'New Email', 'email post type label', 'buddypress' ),
                 'not_found'             => _x( 'No emails found', 'email post type label', 'buddypress' ),
                 'not_found_in_trash'    => _x( 'No emails found in Trash', 'email post type label', 'buddypress' ),

src/bp-core/classes/class-bp-admin.php

@@ -313 +313 @@
 
                         $hooks[] = add_menu_page(
                                 $email_labels['name'],
-                                $email_labels['name'],
+                                $email_labels['menu_name'],
                                 $this->capability,
                                 '',
                                 '',
@@ -345 +345 @@
                 if ( bp_is_root_blog() ) {
                         // Appearance > Emails.
                         $hooks[] = add_theme_page(
-                                _x( 'Emails', 'screen heading', 'buddypress' ),
-                                _x( 'Emails', 'screen heading', 'buddypress' ),
+                                _x( 'BuddyPress Emails', 'screen heading', 'buddypress' ),
+                                _x( 'BuddyPress Emails', 'screen heading', 'buddypress' ),
+                                $this->capability,
+                                'bp-emails-customizer-redirect',
+                                'bp_email_redirect_to_customizer'
+                        );
+
+                        // BP Emails > Customize.
+                        $hooks[] = add_submenu_page(
+                                'edit.php?post_type=' . bp_get_email_post_type(),
+                                _x( 'Customize', 'email menu heading', 'buddypress' ),
+                                _x( 'Customize', 'email menu heading', 'buddypress' ),
                                 $this->capability,
                                 'bp-emails-customizer-redirect',
                                 'bp_email_redirect_to_customizer'