Changeset 6340

Timestamp:

01/10/2018 07:00:21 PM (7 years ago)

Author:

obenland

Message:

Plugins: Make locale banner path-aware.

Links to the localized version of the current path rather than just the Plugin Directory homepage.

Props tellyworth for initial patch.
Fixes #3109.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/api/routes/class-locale-banner.php (modified) (7 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/api/routes/class-locale-banner.php

@@ -86 +86 @@
         // English directory.
         if ( 'en_US' === $current_locale ) {
-            $current_site = get_site();
+            $current_path   = get_site()->path;
+            $referring_path = wp_parse_url( $request->get_header( 'referer' ), PHP_URL_PATH );
+
+            if ( $referring_path && '/' === $referring_path[0] ) {
+                $current_path = $referring_path;
+            }
 
             // Only one locale suggestion.
@@ -97 +102 @@
                         $this->translate( 'This plugin is also available in %1$s. <a href="%2$s">Help improve the translation!</a>', $locale ),
                         sprintf(
-                            '<a href="https://%s.wordpress.org%s%s/">%s</a>',
+                            '<a href="https://%s.wordpress.org%s">%s</a>',
                             $locale_subdomain_assoc[ $locale ]->subdomain,
-                            $current_site->path,
-                            $plugin_slug,
+                            esc_url( $current_path ),
                             $language
                         ),
@@ -111 +115 @@
                             '<a href="https://%s.wordpress.org%s">%s</a>',
                             $locale_subdomain_assoc[ $locale ]->subdomain,
-                            $current_site->path,
+                            esc_url( $current_path ),
                             $language
                         )
@@ -127 +131 @@
                     foreach ( $suggest_named_locales as $locale => $language ) {
                         $other_suggest .= sprintf(
-                            '<a href="https://%s.wordpress.org%s%s/">%s</a>, ',
+                            '<a href="https://%s.wordpress.org%s/">%s</a>, ',
                             $locale_subdomain_assoc[ $locale ]->subdomain,
-                            $current_site->path,
-                            $plugin_slug,
+                            esc_url( $current_path ),
                             $language
                         );
@@ -138 +141 @@
                         $this->translate( 'This plugin is also available in %1$s (also: %2$s). <a href="%3$s">Help improve the translation!</a>', $primary_locale ),
                         sprintf(
-                            '<a href="https://%s.wordpress.org%s%s/">%s</a>',
+                            '<a href="https://%s.wordpress.org%s">%s</a>',
                             $locale_subdomain_assoc[ $primary_locale ]->subdomain,
-                            $current_site->path,
-                            $plugin_slug,
+                            esc_url( $current_path ),
                             $primary_language
                         ),
@@ -153 +155 @@
                             '<a href="https://%s.wordpress.org%s">%s</a>, ',
                             $locale_subdomain_assoc[ $locale ]->subdomain,
-                            $current_site->path,
+                            esc_url( $current_path ),
                             $language
                         );
@@ -163 +165 @@
                             '<a href="https://%s.wordpress.org%s">%s</a>',
                             $locale_subdomain_assoc[ $primary_locale ]->subdomain,
-                            $current_site->path,
+                            esc_url( $current_path ),
                             $primary_language
                         ),