<!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>[40330] trunk: Customize: Improve i18n for strings in hidden widget area notices.</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/40330">40330</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/40330","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>westonruter</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-03-24 22:02:02 +0000 (Fri, 24 Mar 2017)</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: Improve i18n for strings in hidden widget area notices.
Amends <a href="https://core.trac.wordpress.org/changeset/40312">[40312]</a>.
Props westonruter, ocean90, swissspidy, SergeyBiryukov, michelleweber for copywriting.
See <a href="https://core.trac.wordpress.org/ticket/33567">#33567</a>, <a href="https://core.trac.wordpress.org/ticket/33052">#33052</a>.
Fixes <a href="https://core.trac.wordpress.org/ticket/39087">#39087</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminjscustomizewidgetsjs">trunk/src/wp-admin/js/customize-widgets.js</a></li>
<li><a href="#trunksrcwpincludesclasswpcustomizewidgetsphp">trunk/src/wp-includes/class-wp-customize-widgets.php</a></li>
<li><a href="#trunktestsqunitfixturescustomizewidgetsjs">trunk/tests/qunit/fixtures/customize-widgets.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminjscustomizewidgetsjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/js/customize-widgets.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/js/customize-widgets.js 2017-03-24 19:04:26 UTC (rev 40329)
+++ trunk/src/wp-admin/js/customize-widgets.js 2017-03-24 22:02:02 UTC (rev 40330)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1616,7 +1616,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @returns {void}
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> updateNotice = function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var activeSectionCount = getActiveSectionCount(), message, nonRenderedAreaCount, registeredAreaCount;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var activeSectionCount = getActiveSectionCount(), someRenderedMessage, nonRenderedAreaCount, registeredAreaCount;
</ins><span class="cx" style="display: block; padding: 0 10px"> noticeContainer.empty();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> registeredAreaCount = api.Widgets.data.registeredSidebars.length;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1624,15 +1624,17 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 0 !== activeSectionCount ) {
</span><span class="cx" style="display: block; padding: 0 10px"> nonRenderedAreaCount = registeredAreaCount - activeSectionCount;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- message = ( 1 === nonRenderedAreaCount ? l10n.someAreasShown.singular : l10n.someAreasShown.plural ).replace( '%d', nonRenderedAreaCount );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ someRenderedMessage = l10n.someAreasShown[ nonRenderedAreaCount ];
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- message = ( 1 === registeredAreaCount ? l10n.noAreasShown.singular : l10n.noAreasShown.plural ).replace( '%d', registeredAreaCount );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ someRenderedMessage = l10n.noAreasShown;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( someRenderedMessage ) {
+ noticeContainer.append( $( '<p></p>', {
+ text: someRenderedMessage
+ } ) );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> noticeContainer.append( $( '<p></p>', {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- text: message
- } ) );
- noticeContainer.append( $( '<p></p>', {
</del><span class="cx" style="display: block; padding: 0 10px"> text: l10n.navigatePreview
</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="trunksrcwpincludesclasswpcustomizewidgetsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-customize-widgets.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-customize-widgets.php 2017-03-24 19:04:26 UTC (rev 40329)
+++ trunk/src/wp-includes/class-wp-customize-widgets.php 2017-03-24 22:02:02 UTC (rev 40330)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -720,6 +720,47 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </div>'
</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">+ /*
+ * Gather all strings in PHP that may be needed by JS on the client.
+ * Once JS i18n is implemented (in #20491), this can be removed.
+ */
+ $some_non_rendered_areas_messages = array();
+ $some_non_rendered_areas_messages[1] = html_entity_decode(
+ /* translators: placeholder is the number of other widget areas registered but not rendered */
+ __( 'Your theme has 1 other widget area, but this particular page doesn’t display it.' ),
+ ENT_QUOTES,
+ get_bloginfo( 'charset' )
+ );
+ $registered_sidebar_count = count( $wp_registered_sidebars );
+ for ( $non_rendered_count = 2; $non_rendered_count < $registered_sidebar_count; $non_rendered_count++ ) {
+ $some_non_rendered_areas_messages[ $non_rendered_count ] = html_entity_decode( sprintf(
+ /* translators: placeholder is the number of other widget areas registered but not rendered */
+ _n(
+ 'Your theme has %s other widget area, but this particular page doesn’t display it.',
+ 'Your theme has %s other widget areas, but this particular page doesn’t display them.',
+ $non_rendered_count
+ ),
+ number_format_i18n( $non_rendered_count )
+ ), ENT_QUOTES, get_bloginfo( 'charset' ) );
+ }
+
+ if ( 1 === $registered_sidebar_count ) {
+ $no_areas_shown_message = html_entity_decode( sprintf(
+ /* translators: placeholder is the total number of widget areas registered */
+ __( 'Your theme has 1 widget area, but this particular page doesn’t display it.' )
+ ), ENT_QUOTES, get_bloginfo( 'charset' ) );
+ } else {
+ $no_areas_shown_message = html_entity_decode( sprintf(
+ /* translators: placeholder is the total number of widget areas registered */
+ _n(
+ 'Your theme has %s widget area, but this particular page doesn’t display it.',
+ 'Your theme has %s widget areas, but this particular page doesn’t display them.',
+ $registered_sidebar_count
+ ),
+ number_format_i18n( $registered_sidebar_count )
+ ), ENT_QUOTES, get_bloginfo( 'charset' ) );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $settings = array(
</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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -733,22 +774,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'widgetMovedUp' => __( 'Widget moved up' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'widgetMovedDown' => __( 'Widget moved down' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'navigatePreview' => __( 'You can navigate to other pages on your site while using the Customizer to view and edit the widgets displayed on those pages.' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'someAreasShown' => wp_array_slice_assoc(
- /* translators: placeholder is the number of other widget areas registered */
- _n_noop(
- 'Your theme has %d other widget area, but this particular page doesn\'t display it.',
- 'Your theme has %d other widget areas, but this particular page doesn\'t display them.'
- ),
- array( 'singular', 'plural' )
- ),
- 'noAreasShown' => wp_array_slice_assoc(
- /* translators: placeholder is the total number of widget areas registered */
- _n_noop(
- 'Your theme has %d widget area, but this particular page doesn\'t display it.',
- 'Your theme has %d widget areas, but this particular page doesn\'t display them.'
- ),
- array( 'singular', 'plural' )
- ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'someAreasShown' => $some_non_rendered_areas_messages,
+ 'noAreasShown' => $no_areas_shown_message,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'reorderModeOn' => __( 'Reorder mode enabled' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'reorderModeOff' => __( 'Reorder mode closed' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'reorderLabelOn' => esc_attr__( 'Reorder widgets' ),
</span></span></pre></div>
<a id="trunktestsqunitfixturescustomizewidgetsjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/qunit/fixtures/customize-widgets.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/qunit/fixtures/customize-widgets.js 2017-03-24 19:04:26 UTC (rev 40329)
+++ trunk/tests/qunit/fixtures/customize-widgets.js 2017-03-24 22:02:02 UTC (rev 40330)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -48,10 +48,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'l10n': {
</span><span class="cx" style="display: block; padding: 0 10px"> 'error': 'An error has occurred. Please reload the page and try again.',
</span><span class="cx" style="display: block; padding: 0 10px"> 'navigatePreview': 'You can navigate to other pages on your site while using the Customizer to view and edit the widgets displayed on those pages.',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'noAreasShown': {
- 'plural': 'Your theme has %d widget areas, but this particular page doesn\'t display them.',
- 'singular': 'Your theme has %d widget area, but this particular page doesn\'t display it.'
- },
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'noAreasShown': 'Your theme has 3 widget areas, but this particular page doesn\u2019t display them.',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'noWidgetsFound': 'No widgets found.',
</span><span class="cx" style="display: block; padding: 0 10px"> 'removeBtnLabel': 'Remove',
</span><span class="cx" style="display: block; padding: 0 10px"> 'removeBtnTooltip': 'Trash widget by moving it to the inactive widgets sidebar.',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -61,8 +58,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'saveBtnLabel': 'Apply',
</span><span class="cx" style="display: block; padding: 0 10px"> 'saveBtnTooltip': 'Save and preview changes before publishing them.',
</span><span class="cx" style="display: block; padding: 0 10px"> 'someAreasShown': {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'plural': 'Your theme has %d other widget areas, but this particular page doesn\'t display them.',
- 'singular': 'Your theme has %d other widget area, but this particular page doesn\'t display it.'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '1': 'Your theme has 1 other widget area, but this particular page doesn\u2019t display it.',
+ '2': 'Your theme has 2 other widget areas, but this particular page doesn\u2019t display them.'
</ins><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> 'widgetMovedDown': 'Widget moved down',
</span><span class="cx" style="display: block; padding: 0 10px"> 'widgetMovedUp': 'Widget moved up',
</span></span></pre>
</div>
</div>
</body>
</html>