Changeset 11640

Timestamp:

03/04/2022 03:47:24 AM (4 years ago)

Author:

dd32

Message:

Locale Switcher: use a newer Hook to override the locale earlier, and hook immediately, as some plugins use translation functions upon inclusion.

Handbooks: Don't call translation functions upon plugin inclusion, causing translations to load before plugins are loaded.

See ​https://github.com/WordPress/wporg-mu-plugins/issues/133

Location:

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

Files:

• handbook/inc/callout-boxes.php (modified) (2 diffs)
• locale-detection/locale-detection.php (modified) (1 diff)

sites/trunk/wordpress.org/public_html/wp-content/plugins/handbook/inc/callout-boxes.php

@@ -23 +23 @@
          */
         public function __construct() {
-                $this->shortcodes = array(
-                        'info'    => __( 'Note:',    'wporg' ),
-                        'tip'     => __( 'Tip:',     'wporg' ),
-                        'alert'   => __( 'Alert:',   'wporg' ),
-                        'tutorial' => __( 'Tutorial:', 'wporg' ),
-                        'warning' => __( 'Warning:', 'wporg' )
-                );
-
                 add_action( 'init', array( $this, 'register_shortcodes' ) );
         }
@@ -40 +32 @@
          */
         public function register_shortcodes() {
+                $this->shortcodes = array(
+                        'info'     => __( 'Note:',     'wporg' ),
+                        'tip'      => __( 'Tip:',      'wporg' ),
+                        'alert'    => __( 'Alert:',    'wporg' ),
+                        'tutorial' => __( 'Tutorial:', 'wporg' ),
+                        'warning'  => __( 'Warning:',  'wporg' )
+                );
+
                 foreach ( array_keys( $this->shortcodes ) as $name) {
                         add_shortcode( $name, array( $this, "{$name}_shortcode" ) );

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

@@ -24 +24 @@
         $detector = new Detector();
 
-        add_action( 'locale', [ $detector, 'get_locale' ] );
+        add_filter( 'locale', [ $detector, 'get_locale' ] );
+        add_filter( 'pre_determine_locale', [ $detector, 'get_locale' ] );
 }
-add_action( 'plugins_loaded', __NAMESPACE__ . '\init', 1 );
+
+// Override the locale ASAP.
+init();