<!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>[23761] trunk/wp-admin: Use placeholders in menu strings instead of manual concatenation.</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, #logmsg > ol { margin-left: 0; 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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/23761">23761</a></dd>
<dt>Author</dt> <dd>SergeyBiryukov</dd>
<dt>Date</dt> <dd>2013-03-20 05:49:29 +0000 (Wed, 20 Mar 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use placeholders in menu strings instead of manual concatenation. fixes <a href="http://core.trac.wordpress.org/ticket/14045">#14045</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminjsnavmenujs">trunk/wp-admin/js/nav-menu.js</a></li>
<li><a href="#trunkwpadminnavmenusphp">trunk/wp-admin/nav-menus.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminjsnavmenujs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/nav-menu.js (23760 => 23761)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/nav-menu.js 2013-03-20 05:46:39 UTC (rev 23760)
+++ trunk/wp-admin/js/nav-menu.js 2013-03-20 05:49:29 UTC (rev 23761)
</span><span class="lines">@@ -428,40 +428,36 @@
</span><span class="cx">
</span><span class="cx"> // Where can they move this menu item?
</span><span class="cx"> if ( 0 !== position ) {
</span><del>- var thisLink = menuItem.find( '.menus-move-up' ),
- thisLinkText = thisLink.text();
- thisLink.prop('title', menus.move + ' ' + thisLinkText).show();
</del><ins>+ var thisLink = menuItem.find( '.menus-move-up' );
+ thisLink.prop( 'title', menus.moveUp ).show();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( 0 !== position && isPrimaryMenuItem ) {
</span><del>- var thisLink = menuItem.find( '.menus-move-top' ),
- thisLinkText = thisLink.text();
- thisLink.prop('title', menus.move + ' ' + thisLinkText).show();
</del><ins>+ var thisLink = menuItem.find( '.menus-move-top' );
+ thisLink.prop( 'title', menus.moveToTop ).show();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( position + 1 !== totalMenuItems && 0 !== position ) {
</span><del>- var thisLink = menuItem.find( '.menus-move-down' ),
- thisLinkText = thisLink.text();
- thisLink.prop('title', menus.move + ' ' + thisLinkText).show();
</del><ins>+ var thisLink = menuItem.find( '.menus-move-down' );
+ thisLink.prop( 'title', menus.moveDown ).show();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( 0 === position && 0 !== hasSameDepthSibling ) {
</span><del>- var thisLink = menuItem.find( '.menus-move-down' ),
- thisLinkText = thisLink.text();
- thisLink.prop('title', menus.move + ' ' + thisLinkText).show();
</del><ins>+ var thisLink = menuItem.find( '.menus-move-down' );
+ thisLink.prop( 'title', menus.moveDown ).show();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( ! isPrimaryMenuItem ) {
</span><span class="cx"> var thisLink = menuItem.find( '.menus-move-left' ),
</span><del>- thisLinkText = menus.outFrom + ' ' + prevItemNameLeft;
- thisLink.prop('title', menus.move + ' ' + thisLinkText).html(thisLinkText).show();
</del><ins>+ thisLinkText = menus.outFrom.replace( '%s', prevItemNameLeft );
+ thisLink.prop( 'title', menus.moveOutFrom.replace( '%s', prevItemNameLeft ) ).html( thisLinkText ).show();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( 0 !== position ) {
</span><span class="cx"> if ( menuItem.find( '.menu-item-data-parent-id' ).val() !== menuItem.prev().find( '.menu-item-data-db-id' ).val() ) {
</span><span class="cx"> var thisLink = menuItem.find( '.menus-move-right' ),
</span><del>- thisLinkText = menus.under + ' ' + prevItemNameRight;
- thisLink.prop('title', menus.move + ' ' + thisLinkText).html(thisLinkText).show();
</del><ins>+ thisLinkText = menus.under.replace( '%s', prevItemNameRight );
+ thisLink.prop( 'title', menus.moveUnder.replace( '%s', prevItemNameRight ) ).html( thisLinkText ).show();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -471,17 +467,16 @@
</span><span class="cx"> totalMenuItems = primaryItems.length,
</span><span class="cx">
</span><span class="cx"> // String together help text for primary menu items
</span><del>- title = itemName + '. ' + menus.menuFocus.replace('%d', itemPosition).replace('%d', totalMenuItems) + '.';
</del><ins>+ title = menus.menuFocus.replace( '%1$s', itemName ).replace( '%2$d', itemPosition ).replace( '%3$d', totalMenuItems );
</ins><span class="cx"> } else {
</span><span class="cx"> var parentItem = menuItem.prevAll( '.menu-item-depth-' + parseInt( depth - 1 ) ).first(),
</span><span class="cx"> parentItemId = parentItem.find( '.menu-item-data-db-id' ).val(),
</span><span class="cx"> parentItemName = parentItem.find( '.menu-item-title' ).text(),
</span><span class="cx"> subItems = $( '.menu-item .menu-item-data-parent-id[value="' + parentItemId + '"]' ),
</span><del>- itemPosition = $(subItems.parents('.menu-item').get().reverse()).index( menuItem ) + 1;
</del><ins>+ itemPosition = $( subItems.parents('.menu-item').get().reverse() ).index( menuItem ) + 1;
</ins><span class="cx">
</span><span class="cx"> // String together help text for sub menu items
</span><del>-
- title = itemName + '. ' + menus.subMenuFocus.replace('%d', itemPosition) + parentItemName + '.';
</del><ins>+ title = menus.subMenuFocus.replace( '%1$s', itemName ).replace( '%2$d', itemPosition ).replace( '%3$s', parentItemName );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $this.prop('title', title).html( title );
</span></span></pre></div>
<a id="trunkwpadminnavmenusphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/nav-menus.php (23760 => 23761)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/nav-menus.php 2013-03-20 05:46:39 UTC (rev 23760)
+++ trunk/wp-admin/nav-menus.php 2013-03-20 05:49:29 UTC (rev 23761)
</span><span class="lines">@@ -355,12 +355,22 @@
</span><span class="cx"> $one_theme_location_no_menus = ( 1 == count( get_registered_nav_menus() ) && ! $add_new_screen && empty( $nav_menus ) && ! empty( $page_count->publish ) ) ? true : false;
</span><span class="cx">
</span><span class="cx"> $l10n = array(
</span><del>- "oneThemeLocationNoMenus" => $one_theme_location_no_menus,
- "move" => __( 'Move' ),
- "menuFocus" => __( 'Menu item %d of %d' ),
- "subMenuFocus" => __( 'Sub item number %d under' ),
- "under" => __( 'Under' ),
- "outFrom" => __( 'Out from under' )
</del><ins>+ 'oneThemeLocationNoMenus' => $one_theme_location_no_menus,
+ 'moveUp' => __( 'Move up one' ),
+ 'moveDown' => __( 'Move down one' ),
+ 'moveToTop' => __( 'Move to the top' ),
+ /* translators: %s: previous item name */
+ 'moveUnder' => __( 'Move under %s' ),
+ /* translators: %s: previous item name */
+ 'moveOutFrom' => __( 'Move out from under %s' ),
+ /* translators: %s: previous item name */
+ 'under' => __( 'Under %s' ),
+ /* translators: %s: previous item name */
+ 'outFrom' => __( 'Out from under %s' ),
+ /* translators: 1: item name, 2: item position, 3: total number of items */
+ 'menuFocus' => __( '%1$s. Menu item %2$d of %3$d.' ),
+ /* translators: 1: item name, 2: item position, 3: parent item name */
+ 'subMenuFocus' => __( '%1$s. Sub item number %2$d under %3$s.' ),
</ins><span class="cx"> );
</span><span class="cx"> wp_localize_script( 'nav-menu', 'menus', $l10n );
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>