Changeset 39571 for branches/4.7/src/wp-includes/class-wp-customize-widgets.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-widgets.php (modified) (2 diffs)

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

@@ -1124 +1124 @@
                 global $wp_registered_sidebars, $wp_registered_widgets;
 
+                $switched_locale = switch_to_locale( get_user_locale() );
+                $l10n = array(
+                        'widgetTooltip'  => __( 'Shift-click to edit this widget.' ),
+                );
+                if ( $switched_locale ) {
+                        restore_previous_locale();
+                }
+
                 // Prepare Customizer settings to pass to JavaScript.
                 $settings = array(
@@ -1130 +1138 @@
                         'registeredSidebars' => array_values( $wp_registered_sidebars ),
                         'registeredWidgets'  => $wp_registered_widgets,
-                        'l10n'               => array(
-                                'widgetTooltip'  => __( 'Shift-click to edit this widget.' ),
-                        ),
+                        'l10n'               => $l10n,
                         'selectiveRefreshableWidgets' => $this->get_selective_refreshable_widgets(),
                 );