Changeset 55161 for trunk/src/wp-includes/user.php

Timestamp:

01/30/2023 10:25:53 AM (4 years ago)

Author:

swissspidy

Message:

I18N: Introduce switch_to_user_locale().

This new function makes it easier to switch to a specific user’s locale by reducing duplicate code and storing the user’s ID as additional context for plugins to consume. Existing usage of switch_to_locale() in core has been replaced with switch_to_user_locale() where appropriate.

Also, this change ensures WP_Locale_Switcher properly filters determine_locale so that anyyone using the determine_locale() function will get the correct locale information when switching is in effect.

Props costdev.
Fixes #57123.
See #26511.

File:

• trunk/src/wp-includes/user.php (modified) (4 diffs)

trunk/src/wp-includes/user.php

@@ -2579 +2579 @@
         $switched_locale = false;
         if ( ! empty( $send_password_change_email ) || ! empty( $send_email_change_email ) ) {
-                $switched_locale = switch_to_locale( get_user_locale( $user_id ) );
+                $switched_locale = switch_to_user_locale( $user_id );
         }
 
@@ -3140 +3140 @@
         $locale = get_user_locale( $user_data );
 
-        $switched_locale = switch_to_locale( $locale );
+        $switched_locale = switch_to_user_locale( $user_data->ID );
 
         if ( is_multisite() ) {
@@ -4245 +4245 @@
         // Localize message content for user; fallback to site default for visitors.
         if ( ! empty( $request->user_id ) ) {
-                $locale = get_user_locale( $request->user_id );
+                $switched_locale = switch_to_user_locale( $request->user_id );
         } else {
-                $locale = get_locale();
-        }
-
-        $switched_locale = switch_to_locale( $locale );
+                $switched_locale = switch_to_locale( get_locale() );
+        }
 
         /**
@@ -4656 +4654 @@
         // Localize message content for user; fallback to site default for visitors.
         if ( ! empty( $request->user_id ) ) {
-                $locale = get_user_locale( $request->user_id );
+                $switched_locale = switch_to_user_locale( $request->user_id );
         } else {
-                $locale = get_locale();
-        }
-
-        $switched_locale = switch_to_locale( $locale );
+                $switched_locale = switch_to_locale( get_locale() );
+        }
 
         $email_data = array(