Changeset 6029

Timestamp:

10/14/2017 11:46:34 AM (9 years ago)

Author:

SergeyBiryukov

Message:

Plugin Directory: Pull native language names for the locale banner from GP_Locales instead of the languages table.

Props joostdevalk.
Fixes #2618.

File:

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

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

@@ -73 +73 @@
                 $current_locale_is_translated = in_array( $current_locale, $translated_locales );
 
+                require_once GLOTPRESS_LOCALES_PATH;
+
                 // Get the native language names of the locales.
                 $suggest_named_locales = [];
                 foreach ( $suggest_locales as $locale ) {
-                        $name = $this->get_native_language_name( $locale );
-                        if ( $name ) {
-                                $suggest_named_locales[ $locale ] = $name;
-                        }
+                        $suggest_named_locales[ $locale ] = \GP_Locales::by_field( 'wp_locale', $locale )->native_name;
                 }
 
@@ -175 +174 @@
                         $suggest_string = sprintf(
                                 $this->translate( 'This plugin is not available in %1$s yet. <a href="%2$s">Help translate it!</a>', $current_locale ),
-                                $this->get_native_language_name( $current_locale ),
+                                \GP_Locales::by_field( 'wp_locale', $current_locale )->native_name,
                                 esc_url( 'https://translate.wordpress.org/projects/wp-plugins/' . $plugin_slug )
                         );
@@ -313 +312 @@
                 }
 
-                require_once GLOTPRESS_LOCALES_PATH;
                 $gp_locale = \GP_Locales::by_field( 'wp_locale', $wp_locale )->slug;
 
@@ -342 +340 @@
                 return isset( $translations[ $gp_locale ] ) ? $translations[ $gp_locale ] : $string;
         }
-
-        protected function get_native_language_name( $locale ) {
-                global $wpdb;
-
-                $slug = str_replace( '_', '-', $locale );
-                $slug = strtolower( $slug );
-
-                $name = $wpdb->get_var( $wpdb->prepare( 'SELECT name FROM languages WHERE slug = %s', $slug ) );
-                if ( ! $name ) {
-                        $fallback_slug = explode( '-', $slug )[0]; // de-de => de
-                        $name = $wpdb->get_var( $wpdb->prepare( 'SELECT name FROM languages WHERE slug = %s', $fallback_slug ) );
-                        if ( $name ) {
-                                return $name;
-                        }
-                } else {
-                        return $name;
-                }
-
-                return '';
-        }
 }