Changeset 3540

Timestamp:

06/22/2016 10:58:39 AM (8 years ago)

Author:

ocean90

Message:

Plugin Directory: Fix locale banner for browsers which are sending an en-us language header.

See #1728.

File:

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

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

@@ -152 +152 @@
         if ( is_array( $http_locales ) ) {
             foreach ( $http_locales as $http_locale ) {
+                @list( $lang, $region ) = explode( '-', $http_locale );
+                if ( is_null( $region ) ) {
+                    $region = $lang;
+                }
+
                 /*
                  * Discard English -- it's the default for all browsers,
                  * ergo not very reliable information
                  */
-                if ( 'en' === $http_locale || 'en-US' === $http_locale ) {
+                if ( 'en' === $lang ) {
                     continue;
                 }
 
-                @list( $lang, $region ) = explode( '-', $http_locale );
-                if ( is_null( $region ) ) {
-                    $region = $lang;
-                }
+                // Region should be uppercase.
+                $region = strtoupper( $region );
 
                 if ( $mapped = $this->map_locale( $lang, $region, $available_locales ) ) {
@@ -273 +276 @@
         unset( $translation );
 
-    #   wp_cache_add( 'original-' . $original_id, $translations, 'lang-guess-translations', 900 );
+        wp_cache_add( 'original-' . $original_id, $translations, 'lang-guess-translations', 900 );
 
         return isset( $translations[ $gp_locale ] ) ? $translations[ $gp_locale ] : $string;