Changeset 3491

Timestamp:

06/20/2016 08:40:10 AM (9 years ago)

Author:

ocean90

Message:

Plugin Directory: Don't display a locale banner if a plugin is translated into the locale of the current site.

See #1728.

File:

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

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

@@ -63 +63 @@
         // Build a list of WordPress locales which we'll suggest to the user.
         $suggest_locales = array_values( array_intersect( $translated_locales, $locales_from_header ) );
-        $suggest_locales = array_diff( $suggest_locales, [ $current_locale ] );
+        $current_locale_is_suggested = in_array( $current_locale, $suggest_locales );
+        if ( $current_locale_is_suggested ) {
+            $suggest_locales = array_diff( $suggest_locales, [ $current_locale ] );
+        }
 
         // Get the native language names of the locales.
@@ -86 +89 @@
             $suggest_string = sprintf(
                 /* translators: %s: native language name. */
-                __( 'This plugin also available in %s.', 'wporg-plugins' ),
+                __( 'This plugin is also available in %s.', 'wporg-plugins' ),
                 sprintf(
                     '<a href="https://%s.wordpress.org/plugins-wp/%s/">%s</a>',
@@ -111 +114 @@
             $suggest_string = sprintf(
                 /* translators: 1: native language name, 2: native language names */
-                __( 'This plugin also available in %1$s (also: %2$s).', 'wporg-plugins' ),
+                __( 'This plugin is also available in %1$s (also: %2$s).', 'wporg-plugins' ),
                 sprintf(
                     '<a href="https://%s.wordpress.org/plugins-wp/%s/">%s</a>',
@@ -120 +123 @@
                 trim( $other_suggest, ' ,' )
             );
-        } elseif ( 'en_US' !== $current_locale ) {
+        } elseif ( 'en_US' !== $current_locale && ! $current_locale_is_suggested ) {
             $suggest_string = sprintf(
                 /* translators: %s: URL to translate.wordpress.org */