Changeset 39571 for branches/4.7/src/wp-includes/class-wp-customize-manager.php

Timestamp:

12/12/2016 01:58:21 AM (10 years ago)

Author:

dd32

Message:

Customize: Use selected user language for edit shortcuts in preview instead of site language.

Props ocean90.
Merges [39545] to the 4.7 branch.
Fixes #39009.

Location:

branches/4.7

Files:

• . (modified) (1 prop)
• src/wp-includes/class-wp-customize-manager.php (modified) (2 diffs)

branches/4.7/src/wp-includes/class-wp-customize-manager.php

@@ -1777 +1777 @@
                         $allowed_hosts[] = $host;
                 }
+
+                $switched_locale = switch_to_locale( get_user_locale() );
+                $l10n = array(
+                        'shiftClickToEdit' => __( 'Shift-click to edit this element.' ),
+                        'linkUnpreviewable' => __( 'This link is not live-previewable.' ),
+                        'formUnpreviewable' => __( 'This form is not live-previewable.' ),
+                );
+                if ( $switched_locale ) {
+                        restore_previous_locale();
+                }
+
                 $settings = array(
                         'changeset' => array(
@@ -1801 +1812 @@
                         'settingValidities' => $exported_setting_validities,
                         'nonce' => current_user_can( 'customize' ) ? $this->get_nonces() : array(),
-                        'l10n' => array(
-                                'shiftClickToEdit' => __( 'Shift-click to edit this element.' ),
-                                'linkUnpreviewable' => __( 'This link is not live-previewable.' ),
-                                'formUnpreviewable' => __( 'This form is not live-previewable.' ),
-                        ),
+                        'l10n' => $l10n,
                         '_dirty' => array_keys( $post_values ),
                 );