Changeset 39571

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)
• src/wp-includes/class-wp-customize-widgets.php (modified) (2 diffs)
• src/wp-includes/customize/class-wp-customize-selective-refresh.php (modified) (1 diff)

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 ),
                 );

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(),
                 );

branches/4.7/src/wp-includes/customize/class-wp-customize-selective-refresh.php

@@ -180 +180 @@
                 }
 
+                $switched_locale = switch_to_locale( get_user_locale() );
+                $l10n = array(
+                        'shiftClickToEdit' => __( 'Shift-click to edit this element.' ),
+                        'clickEditMenu' => __( 'Click to edit this menu.' ),
+                        'clickEditWidget' => __( 'Click to edit this widget.' ),
+                        'clickEditTitle' => __( 'Click to edit the site title.' ),
+                        'clickEditMisc' => __( 'Click to edit this element.' ),
+                        /* translators: %s: document.write() */
+                        'badDocumentWrite' => sprintf( __( '%s is forbidden' ), 'document.write()' ),
+                );
+                if ( $switched_locale ) {
+                        restore_previous_locale();
+                }
+
                 $exports = array(
                         'partials'       => $partials,
                         'renderQueryVar' => self::RENDER_QUERY_VAR,
-                        'l10n'           => array(
-                                'shiftClickToEdit' => __( 'Shift-click to edit this element.' ),
-                                'clickEditMenu' => __( 'Click to edit this menu.' ),
-                                'clickEditWidget' => __( 'Click to edit this widget.' ),
-                                'clickEditTitle' => __( 'Click to edit the site title.' ),
-                                'clickEditMisc' => __( 'Click to edit this element.' ),
-                                /* translators: %s: document.write() */
-                                'badDocumentWrite' => sprintf( __( '%s is forbidden' ), 'document.write()' ),
-                        ),
+                        'l10n'           => $l10n,
                 );