Ticket #4631: 4631.patch

bp-activity/bp-activity-loader.php

@@ -101 +101 @@
                         'slug'                  => BP_ACTIVITY_SLUG,
                         'root_slug'             => isset( $bp->pages->activity->slug ) ? $bp->pages->activity->slug : BP_ACTIVITY_SLUG,
                         'has_directory'         => true,
+                        'directory_title'       => __( 'Activity Directory', 'buddypress' ),
                         'search_string'         => __( 'Search Activity...', 'buddypress' ),
                         'global_tables'         => $global_tables,
                         'notification_callback' => 'bp_activity_format_notifications',

bp-core/bp-core-component.php

@@ -195 +195 @@
                         'slug'                  => $this->id,
                         'root_slug'             => $default_root_slug,
                         'has_directory'         => false,
+                        'directory_title'       => '',
                         'notification_callback' => '',
                         'search_string'         => '',
                         'global_tables'         => ''

bp-core/bp-core-filters.php

@@ -385 +385 @@
 
         // An index or directory
         } elseif ( bp_is_directory() ) {
-                if ( !bp_current_component() ) {
-                        $title = sprintf( __( '%s Directory', 'buddypress' ), bp_get_name_from_root_slug() );
+
+                $current_component = bp_current_component();
+
+                // No current component (when does this happen?)
+                if ( empty( $current_component ) ) {
+                        $title = __( 'Directory', 'buddypress' );
+
+                // Component has registered a Directory Title
+                } else if ( ! empty( $bp->{$current_component}->directory_title ) ) {
+                        $title = $bp->{$current_component}->directory_title;
+
+                // No directory title was provided, so we concatenate one
                 } else {
                         $title = sprintf( __( '%s Directory', 'buddypress' ), bp_get_name_from_root_slug() );
                 }