Changeset 6640

Timestamp:

02/15/2018 10:26:52 AM (8 years ago)

Author:

obenland

Message:

Locale detector: Save locale in cookie

Also switches to using the actual list of available locales.

Props ocean90.
See #1673.

Location:

sites/trunk/wordpress.org/public_html/wp-content/plugins

Files:

• locale-detection/class-detector.php (modified) (4 diffs)
• rosetta/inc/admin/network/class-locale-associations.php (modified) (1 diff)

sites/trunk/wordpress.org/public_html/wp-content/plugins/locale-detection/class-detector.php

@@ -42 +42 @@
          */
         public function __construct() {
-                $this->active_locales = array_merge(
-                        $this->active_locales,
-                        (array) glob( get_template_directory() . '/languages/*.mo' ),
-                        (array) glob( get_stylesheet_directory() . '/languages/*.mo' )
-                );
-                foreach ( $this->active_locales as &$mo_file ) {
-                        $mo_file = basename( $mo_file, '.mo' );
+                $this->active_locales = $this->get_active_locales();
+
+                if ( ! empty( $_COOKIE[ 'wporg_locale' ] ) ) {
+                        $locale = $this->sanitize_locale( $_COOKIE['wporg_locale'] );
+
+                        if ( in_array( $locale, $this->active_locales, true ) ) {
+                                $this->locale = $locale;
+                                return;
+                        }
                 }
-                unset( $mo_file );
 
                 if ( isset( $_GET['locale'] ) ) {
-                        $get_locale = preg_replace( '/[^A-Z_-]/i', '', $_GET['locale'] );
+                        $get_locale = $this->sanitize_locale( $_GET['locale'] );
 
                         $this->locale = $this->check_variants( $get_locale ) ?: $this->locale;
@@ -59 +60 @@
                         $this->locale = $this->guess_locale() ?: $this->locale;
                 }
+
+                setcookie( 'wporg_locale', $this->locale, time() + YEAR_IN_SECONDS, SITECOOKIEPATH, COOKIE_DOMAIN, is_ssl() );
         }
 
@@ -68 +71 @@
         public function get_locale() {
                 return $this->locale;
+        }
+
+        /**
+         * Returns the list of available locales.
+         *
+         * @return array
+         */
+        public function get_active_locales() {
+                wp_cache_add_global_groups( [ 'locale-associations' ] );
+
+                $locales = wp_cache_get( 'locale-list', 'locale-associations' );
+                if ( false === $locales ) {
+                        $locales = (array) $GLOBALS['wpdb']->get_col( 'SELECT locale FROM wporg_locales' );
+                        wp_cache_set( 'locale-list', $locales, 'locale-associations' );
+                }
+
+                return $locales;
         }
 
@@ -165 +185 @@
                 return '';
         }
+
+        /**
+         * Returns a valid locale string.
+         *
+         * @param string $locale Locale string to be sanitized.
+         * @return string
+         */
+        protected function sanitize_locale( $locale ) {
+                return preg_replace( '/[^a-zA-Z0-9_]/', '', $locale );
+        }
 }

sites/trunk/wordpress.org/public_html/wp-content/plugins/rosetta/inc/admin/network/class-locale-associations.php

@@ -195 +195 @@
 
                 wp_cache_delete( 'subdomains', 'locale-associations' );
+                wp_cache_delete( 'local-list', 'locale-associations' );
                 wp_cache_delete( 'local-sites', 'locale-associations' );
                 wp_cache_delete( 'id-locale', 'locale-associations' );