Changeset 38961 for trunk/src/wp-admin/includes/ms.php

Timestamp:

10/26/2016 03:35:58 PM (10 years ago)

Author:

ocean90

Message:

I18N: Introduce a locale-switching function.

With the introduction of user-specific languages in [38705] it's necessary to be able to switch translations on the fly. For example emails should be sent in the language of the recipient and not the one of the current user.

This introduces a new WP_Locale_Switcher class which is used for switching locales and translations. It holds the stack of locales whenever switch_to_locale( $locale ) is called. With restore_previous_locale() you can restore the previous locale. restore_current_locale() empties the stack and sets the locale back to the initial value.

switch_to_locale() is added to most of core's email functions, either with the value of get_locale() (site language) or get_user_locale() (user language with fallback to site language).

Props yoavf, tfrommen, swissspidy, pbearne, ocean90.
See #29783.
Fixes #26511.

File:

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

trunk/src/wp-admin/includes/ms.php

@@ -273 +273 @@
     update_option( 'adminhash', $new_admin_email );
 
+    $switched_locale = switch_to_locale( get_user_locale() );
+
     /* translators: Do not translate USERNAME, ADMIN_URL, EMAIL, SITENAME, SITEURL: those are placeholders. */
     $email_text = __( 'Howdy ###USERNAME###,
@@ -316 +318 @@
 
     wp_mail( $value, sprintf( __( '[%s] New Admin Email Address' ), wp_specialchars_decode( get_option( 'blogname' ) ) ), $content );
+
+    if ( $switched_locale ) {
+        restore_previous_locale();
+    }
 }
 
@@ -353 +359 @@
         );
         update_user_meta( $current_user->ID, '_new_email', $new_user_email );
+
+        $switched_locale = switch_to_locale( get_user_locale() );
 
         /* translators: Do not translate USERNAME, ADMIN_URL, EMAIL, SITENAME, SITEURL: those are placeholders. */
@@ -396 +404 @@
         wp_mail( $_POST['email'], sprintf( __( '[%s] New Email Address' ), wp_specialchars_decode( get_option( 'blogname' ) ) ), $content );
         $_POST['email'] = $current_user->user_email;
+
+        if ( $switched_locale ) {
+            restore_previous_locale();
+        }
     }
 }