<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[39571] branches/4.7: Customize: Use selected user language for edit shortcuts in preview instead of site language.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/39571">39571</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/39571","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dd32</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-12-12 01:58:21 +0000 (Mon, 12 Dec 2016)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Customize: Use selected user language for edit shortcuts in preview instead of site language.
Props ocean90.
Merges <a href="https://core.trac.wordpress.org/changeset/39545">[39545]</a> to the 4.7 branch.
Fixes <a href="https://core.trac.wordpress.org/ticket/39009">#39009</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches47srcwpincludesclasswpcustomizemanagerphp">branches/4.7/src/wp-includes/class-wp-customize-manager.php</a></li>
<li><a href="#branches47srcwpincludesclasswpcustomizewidgetsphp">branches/4.7/src/wp-includes/class-wp-customize-widgets.php</a></li>
<li><a href="#branches47srcwpincludescustomizeclasswpcustomizeselectiverefreshphp">branches/4.7/src/wp-includes/customize/class-wp-customize-selective-refresh.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches47">branches/4.7/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/4.7
</span><span class="cx" style="display: block; padding: 0 10px">===================================================================
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">--- branches/4.7 2016-12-12 01:56:53 UTC (rev 39570)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/4.7 2016-12-12 01:58:21 UTC (rev 39571)
</ins><a id="branches47"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/4.7</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: svn:mergeinfo</h4></div>
<span class="cx" style="display: block; padding: 0 10px"> /branches/3.1:18031
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/3.3:20543
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/3.4:21757
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/trunk:18512,39365,39367,39369,39371,39373,39375-39376,39378,39380,39382,39384,39386,39388,39390,39392-39393,39396-39397,39400,39402,39404,39406,39409,39411,39413,39415,39417-39420,39424,39426,39428,39430,39432-39434,39436,39438,39440,39442-39444,39447,39449-39451,39453,39455-39457,39460,39462,39464,39466,39468,39470-39471,39475,39477-39478,39482-39483,39487-39488,39490,39495-39496,39499,39502,39504,39506,39508,39510,39512,39514,39517,39520,39522,39546,39557-39559
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/trunk:18512,39365,39367,39369,39371,39373,39375-39376,39378,39380,39382,39384,39386,39388,39390,39392-39393,39396-39397,39400,39402,39404,39406,39409,39411,39413,39415,39417-39420,39424,39426,39428,39430,39432-39434,39436,39438,39440,39442-39444,39447,39449-39451,39453,39455-39457,39460,39462,39464,39466,39468,39470-39471,39475,39477-39478,39482-39483,39487-39488,39490,39495-39496,39499,39502,39504,39506,39508,39510,39512,39514,39517,39520,39522,39545-39546,39557-39559
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches47srcwpincludesclasswpcustomizemanagerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.7/src/wp-includes/class-wp-customize-manager.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.7/src/wp-includes/class-wp-customize-manager.php 2016-12-12 01:56:53 UTC (rev 39570)
+++ branches/4.7/src/wp-includes/class-wp-customize-manager.php 2016-12-12 01:58:21 UTC (rev 39571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1776,6 +1776,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $allowed_hosts[] = $host;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $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();
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $settings = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'changeset' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'uuid' => $this->_changeset_uuid,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1800,11 +1811,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'activeControls' => array(),
</span><span class="cx" style="display: block; padding: 0 10px"> 'settingValidities' => $exported_setting_validities,
</span><span class="cx" style="display: block; padding: 0 10px"> 'nonce' => current_user_can( 'customize' ) ? $this->get_nonces() : array(),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'l10n' => array(
- 'shiftClickToEdit' => __( 'Shift-click to edit this element.' ),
- 'linkUnpreviewable' => __( 'This link is not live-previewable.' ),
- 'formUnpreviewable' => __( 'This form is not live-previewable.' ),
- ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'l10n' => $l10n,
</ins><span class="cx" style="display: block; padding: 0 10px"> '_dirty' => array_keys( $post_values ),
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="branches47srcwpincludesclasswpcustomizewidgetsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.7/src/wp-includes/class-wp-customize-widgets.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.7/src/wp-includes/class-wp-customize-widgets.php 2016-12-12 01:56:53 UTC (rev 39570)
+++ branches/4.7/src/wp-includes/class-wp-customize-widgets.php 2016-12-12 01:58:21 UTC (rev 39571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1123,15 +1123,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function export_preview_data() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_registered_sidebars, $wp_registered_widgets;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $switched_locale = switch_to_locale( get_user_locale() );
+ $l10n = array(
+ 'widgetTooltip' => __( 'Shift-click to edit this widget.' ),
+ );
+ if ( $switched_locale ) {
+ restore_previous_locale();
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Prepare Customizer settings to pass to JavaScript.
</span><span class="cx" style="display: block; padding: 0 10px"> $settings = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'renderedSidebars' => array_fill_keys( array_unique( $this->rendered_sidebars ), true ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'renderedWidgets' => array_fill_keys( array_keys( $this->rendered_widgets ), true ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'registeredSidebars' => array_values( $wp_registered_sidebars ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'registeredWidgets' => $wp_registered_widgets,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'l10n' => array(
- 'widgetTooltip' => __( 'Shift-click to edit this widget.' ),
- ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'l10n' => $l10n,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'selectiveRefreshableWidgets' => $this->get_selective_refreshable_widgets(),
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $settings['registeredWidgets'] as &$registered_widget ) {
</span></span></pre></div>
<a id="branches47srcwpincludescustomizeclasswpcustomizeselectiverefreshphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.7/src/wp-includes/customize/class-wp-customize-selective-refresh.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.7/src/wp-includes/customize/class-wp-customize-selective-refresh.php 2016-12-12 01:56:53 UTC (rev 39570)
+++ branches/4.7/src/wp-includes/customize/class-wp-customize-selective-refresh.php 2016-12-12 01:58:21 UTC (rev 39571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -179,18 +179,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $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();
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $exports = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'partials' => $partials,
</span><span class="cx" style="display: block; padding: 0 10px"> 'renderQueryVar' => self::RENDER_QUERY_VAR,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '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()' ),
- ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'l10n' => $l10n,
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Export data to JS.
</span></span></pre>
</div>
</div>
</body>
</html>