Changeset 5009

Timestamp:

02/24/2017 11:31:10 PM (10 years ago)

Author:

ocean90

Message:

Plugin Directory: Don't hardcode the site path.

File:

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

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

@@ -83 +83 @@
 
                 $suggest_string = '';
+
+                // English directory.
                 if ( 'en_US' === $current_locale ) {
+                        $current_site = get_site();
+
+                        // Only one locale suggestion.
                         if ( 1 === count( $suggest_named_locales ) ) {
                                 $locale   = key( $suggest_named_locales );
@@ -92 +97 @@
                                                 $this->translate( 'This plugin is also available in %s.', $locale ),
                                                 sprintf(
-                                                        '<a href="https://%s.wordpress.org/plugins-wp/%s/">%s</a>',
+                                                        '<a href="https://%s.wordpress.org%s%s/">%s</a>',
                                                         $locale_subdomain_assoc[ $locale ]->subdomain,
+                                                        $current_site->path,
                                                         $plugin_slug,
                                                         $language
@@ -102 +108 @@
                                                 $this->translate( 'The plugin directory is also available in %s.', $locale ),
                                                 sprintf(
-                                                        '<a href="https://%s.wordpress.org/plugins-wp/">%s</a>',
+                                                        '<a href="https://%s.wordpress.org%s">%s</a>',
                                                         $locale_subdomain_assoc[ $locale ]->subdomain,
+                                                        $current_site->path,
                                                         $language
                                                 )
                                         );
                                 }
+
+                        // Multiple locale suggestions.
                         } elseif ( ! empty( $suggest_named_locales ) ) {
                                 $primary_locale = key( $suggest_named_locales );
@@ -117 +126 @@
                                         foreach ( $suggest_named_locales as $locale => $language ) {
                                                 $other_suggest .= sprintf(
-                                                        '<a href="https://%s.wordpress.org/plugins-wp/%s/">%s</a>, ',
+                                                        '<a href="https://%s.wordpress.org%s%s/">%s</a>, ',
                                                         $locale_subdomain_assoc[ $locale ]->subdomain,
+                                                        $current_site->path,
                                                         $plugin_slug,
                                                         $language
@@ -127 +137 @@
                                                 $this->translate( 'This plugin is also available in %1$s (also: %2$s).', $primary_locale ),
                                                 sprintf(
-                                                        '<a href="https://%s.wordpress.org/plugins-wp/%s/">%s</a>',
+                                                        '<a href="https://%s.wordpress.org%s%s/">%s</a>',
                                                         $locale_subdomain_assoc[ $primary_locale ]->subdomain,
+                                                        $current_site->path,
                                                         $plugin_slug,
                                                         $primary_language
@@ -138 +149 @@
                                         foreach ( $suggest_named_locales as $locale => $language ) {
                                                 $other_suggest .= sprintf(
-                                                        '<a href="https://%s.wordpress.org/plugins-wp/">%s</a>, ',
+                                                        '<a href="https://%s.wordpress.org%s">%s</a>, ',
                                                         $locale_subdomain_assoc[ $locale ]->subdomain,
+                                                        $current_site->path,
                                                         $language
                                                 );
@@ -147 +159 @@
                                                 $this->translate( 'The plugin directory is also available in %1$s (also: %2$s).', $primary_locale ),
                                                 sprintf(
-                                                        '<a href="https://%s.wordpress.org/plugins-wp/">%s</a>',
+                                                        '<a href="https://%s.wordpress.org%s">%s</a>',
                                                         $locale_subdomain_assoc[ $primary_locale ]->subdomain,
+                                                        $current_site->path,
                                                         $primary_language
                                                 ),
@@ -155 +168 @@
                                 }
                         }
+
+                // Localized directory.
                 } elseif ( ! $current_locale_is_suggested && ! $current_locale_is_translated && $is_plugin_request ) {
                         $suggest_string = sprintf(
@@ -232 +247 @@
                         return $matches[0];
                 } else {
-                        return array();
+                        return [];
                 }
         }