Changeset 59460

Timestamp:

11/26/2024 10:01:08 AM (23 months ago)

Author:

swissspidy

Message:

I18N: Switch locale to admin locale when sending auto update emails.

If sending an auto update email to the site administrator's email address, look up if a user with the same email exists and switch to that user's locale. If not, explicitly switches to the site locale.

This is a follow-up to [59128] where this was previously added for other types of emails.

Props benniledl, swissspidy.
Fixes #62496.

File:

• trunk/src/wp-admin/includes/class-wp-automatic-updater.php (modified) (6 diffs)

trunk/src/wp-admin/includes/class-wp-automatic-updater.php

@@ -937 +937 @@
                 }
 
+                $admin_user = get_user_by( 'email', get_site_option( 'admin_email' ) );
+
+                if ( $admin_user ) {
+                        $switched_locale = switch_to_user_locale( $admin_user->ID );
+                } else {
+                        $switched_locale = switch_to_locale( get_locale() );
+                }
+
                 switch ( $type ) {
                         case 'success': // We updated.
@@ -1140 +1148 @@
 
                 wp_mail( $email['to'], wp_specialchars_decode( $email['subject'] ), $email['body'], $email['headers'] );
+
+                if ( $switched_locale ) {
+                        restore_previous_locale();
+                }
         }
-
 
         /**
@@ -1254 +1265 @@
                                 return;
                         }
+                }
+
+                $admin_user = get_user_by( 'email', get_site_option( 'admin_email' ) );
+
+                if ( $admin_user ) {
+                        $switched_locale = switch_to_user_locale( $admin_user->ID );
+                } else {
+                        $switched_locale = switch_to_locale( get_locale() );
                 }
 
@@ -1527 +1546 @@
                         update_option( 'auto_plugin_theme_update_emails', $past_failure_emails );
                 }
+
+                if ( $switched_locale ) {
+                        restore_previous_locale();
+                }
         }
 
@@ -1535 +1558 @@
          */
         protected function send_debug_email() {
-                $update_count = 0;
-                foreach ( $this->update_results as $type => $updates ) {
-                        $update_count += count( $updates );
+                $admin_user = get_user_by( 'email', get_site_option( 'admin_email' ) );
+
+                if ( $admin_user ) {
+                        $switched_locale = switch_to_user_locale( $admin_user->ID );
+                } else {
+                        $switched_locale = switch_to_locale( get_locale() );
                 }
 
@@ -1716 +1742 @@
 
                 wp_mail( $email['to'], wp_specialchars_decode( $email['subject'] ), $email['body'], $email['headers'] );
+
+                if ( $switched_locale ) {
+                        restore_previous_locale();
+                }
         }