From 63456791441f05ae4988126cfe939e1b64d0c0d1 Mon Sep 17 00:00:00 2001
From: Konstantin Obenland <obenland@gmx.de>
Date: Tue, 10 Nov 2026 15:38:36 -0600
Subject: [PATCH 1/3] Translate: Merge the Plugins and Themes breadcrumbs into
 the project breadcrumb
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The /projects/wp-plugins/ and /projects/wp-themes/ archives redirect to the
homepage, so linking them from the breadcrumb sends people somewhere they
didn't expect. Fold the Plugins or Themes label into the crumb of the plugin
or theme that follows it, as in “Projects / Plugins: Plugin Name / Stable”.

Fixes #7649.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 .../inc/class-plugin.php                      | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/inc/class-plugin.php b/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/inc/class-plugin.php
index 161c3e090e..8a9dca01d8 100644
--- a/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/inc/class-plugin.php
+++ b/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/inc/class-plugin.php
@@ -67,6 +67,7 @@ private function __construct() {
 	function plugins_loaded() {
 		add_filter( 'gp_url_profile', array( $this, 'worg_profile_url' ), 10, 2 );
 		add_filter( 'gp_projects', array( $this, 'natural_sort_projects' ), 10, 2 );
+		add_filter( 'gp_breadcrumb_items', array( $this, 'merge_directory_breadcrumbs' ), 5 );
 		add_action( 'gp_project_created', array( $this, 'update_projects_last_updated' ) );
 		add_action( 'gp_project_saved', array( $this, 'update_projects_last_updated' ) );
 		add_filter( 'pre_handle_404', array( $this, 'short_circuit_handle_404' ) );
@@ -758,6 +759,36 @@ public function worg_profile_url( $url, $nicename ) {
 		return 'https://profiles.wordpress.org/' . $nicename . '/';
 	}
 
+	/**
+	 * Merges the Plugins and Themes breadcrumbs into the project breadcrumb that follows them.
+	 *
+	 * The wp-plugins and wp-themes archives redirect to the homepage, so they shouldn't be linked.
+	 *
+	 * @param string[] $items Breadcrumb items as HTML strings.
+	 * @return string[] Filtered breadcrumb items.
+	 */
+	public function merge_directory_breadcrumbs( $items ) {
+		$items = array_values( $items );
+
+		foreach ( $items as $index => $item ) {
+			if ( ! isset( $items[ $index + 1 ] ) ) {
+				break;
+			}
+
+			foreach ( array( 'wp-plugins', 'wp-themes' ) as $path ) {
+				$url = esc_url( gp_url_project( $path ) );
+
+				// Only merge into a link to one of the directory's projects, not an action like "Edit".
+				if ( str_starts_with( $item, '<a href="' . $url . '"' ) && str_starts_with( $items[ $index + 1 ], '<a href="' . $url ) ) {
+					$items[ $index + 1 ] = wp_strip_all_tags( $item ) . ': ' . $items[ $index + 1 ];
+					unset( $items[ $index ] );
+				}
+			}
+		}
+
+		return array_values( $items );
+	}
+
 	/**
 	 * Natural sorting for sub-projects, and attach whitelisted meta.
 	 *

From fb05f81dbc21a9a1a3923c6f48236f3e0abf80b5 Mon Sep 17 00:00:00 2001
From: Konstantin Obenland <obenland@gmx.de>
Date: Tue, 10 Nov 2026 15:47:31 -0600
Subject: [PATCH 2/3] Translate: Unlink the Plugins and Themes crumbs when
 there's nothing to merge into

On a plugin or theme's own page, and on the wp-plugins and wp-themes
projects' admin screens, the crumb after Plugins or Themes is plain text,
so the merge was skipped and the label still linked to the redirecting
archive. Keep the label as plain text in that case.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 .../wporg-gp-customizations/inc/class-plugin.php      | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/inc/class-plugin.php b/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/inc/class-plugin.php
index 8a9dca01d8..d068a15547 100644
--- a/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/inc/class-plugin.php
+++ b/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/inc/class-plugin.php
@@ -763,6 +763,7 @@ public function worg_profile_url( $url, $nicename ) {
 	 * Merges the Plugins and Themes breadcrumbs into the project breadcrumb that follows them.
 	 *
 	 * The wp-plugins and wp-themes archives redirect to the homepage, so they shouldn't be linked.
+	 * Without a project link to merge into, the label is kept as plain text.
 	 *
 	 * @param string[] $items Breadcrumb items as HTML strings.
 	 * @return string[] Filtered breadcrumb items.
@@ -778,10 +779,16 @@ public function merge_directory_breadcrumbs( $items ) {
 			foreach ( array( 'wp-plugins', 'wp-themes' ) as $path ) {
 				$url = esc_url( gp_url_project( $path ) );
 
-				// Only merge into a link to one of the directory's projects, not an action like "Edit".
-				if ( str_starts_with( $item, '<a href="' . $url . '"' ) && str_starts_with( $items[ $index + 1 ], '<a href="' . $url ) ) {
+				if ( ! str_starts_with( $item, '<a href="' . $url . '"' ) ) {
+					continue;
+				}
+
+				// Only merge into a link to one of the directory's projects, not plain text like "Edit".
+				if ( str_starts_with( $items[ $index + 1 ], '<a href="' . $url ) ) {
 					$items[ $index + 1 ] = wp_strip_all_tags( $item ) . ': ' . $items[ $index + 1 ];
 					unset( $items[ $index ] );
+				} else {
+					$items[ $index ] = wp_strip_all_tags( $item );
 				}
 			}
 		}

From a3a59c62a6718159686f25a07f4952a14b10219a Mon Sep 17 00:00:00 2001
From: Konstantin Obenland <obenland@gmx.de>
Date: Tue, 10 Nov 2026 15:51:00 -0600
Subject: [PATCH 3/3] Translate: Merge the Plugins and Themes crumbs on a
 plugin or theme's own page
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

GlotPress renders the current project as plain text at the end of the
breadcrumb, which the filter can't tell apart from an action like “Edit”.
The directory templates know they show a plugin or theme, so they build the
merged “Plugins: Name” crumb themselves.

See #7649.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 .../templates/projects-wp-plugins.php                     | 8 +++++++-
 .../templates/projects-wp-themes.php                      | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/templates/projects-wp-plugins.php b/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/templates/projects-wp-plugins.php
index 7aa30aab79..20c06cfa5b 100644
--- a/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/templates/projects-wp-plugins.php
+++ b/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/templates/projects-wp-plugins.php
@@ -10,7 +10,13 @@
 ];
 
 gp_title( sprintf( __( '%s &lt; GlotPress' ), esc_html( $project->name ) ) );
-gp_breadcrumb_project( $project );
+// The Plugins archive redirects to the homepage, so its crumb is merged into the project name.
+gp_breadcrumb(
+	array(
+		gp_link_get( gp_url( '/projects' ), __( 'Projects', 'glotpress' ) ),
+		'Plugins: ' . esc_html( $project->name ),
+	)
+);
 
 gp_enqueue_script( 'common' );
 gp_enqueue_script( 'tablesorter' );
diff --git a/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/templates/projects-wp-themes.php b/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/templates/projects-wp-themes.php
index 9b8669b13c..8b88256b7f 100644
--- a/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/templates/projects-wp-themes.php
+++ b/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/templates/projects-wp-themes.php
@@ -7,7 +7,13 @@
 ];
 
 gp_title( sprintf( __( '%s &lt; GlotPress' ), esc_html( $project->name ) ) );
-gp_breadcrumb_project( $project );
+// The Themes archive redirects to the homepage, so its crumb is merged into the project name.
+gp_breadcrumb(
+	array(
+		gp_link_get( gp_url( '/projects' ), __( 'Projects', 'glotpress' ) ),
+		'Themes: ' . esc_html( $project->name ),
+	)
+);
 
 gp_enqueue_script( 'common' );
 gp_enqueue_script( 'tablesorter' );