<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[17373] branches/3.1: Add context to 'Format' string.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/17373">17373</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2011-01-31 14:44:33 +0000 (Mon, 31 Jan 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add context to 'Format' string. props scribu, SergeyBiryukov, fixes <a href="http://trac.wordpress.org/ticket/16423">#16423</a> for the 3.1 branch.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches31wpadmineditformadvancedphp">branches/3.1/wp-admin/edit-form-advanced.php</a></li>
<li><a href="#branches31wpincludestaxonomyphp">branches/3.1/wp-includes/taxonomy.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches31wpadmineditformadvancedphp"></a>
<div class="modfile"><h4>Modified: branches/3.1/wp-admin/edit-form-advanced.php (17372 => 17373)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.1/wp-admin/edit-form-advanced.php 2011-01-31 12:18:57 UTC (rev 17372)
+++ branches/3.1/wp-admin/edit-form-advanced.php 2011-01-31 14:44:33 UTC (rev 17373)
</span><span class="lines">@@ -109,7 +109,7 @@
</span><span class="cx"> add_meta_box('submitdiv', __('Publish'), 'post_submit_meta_box', $post_type, 'side', 'core');
</span><span class="cx">
</span><span class="cx"> if ( current_theme_supports( 'post-formats' ) && post_type_supports( $post_type, 'post-formats' ) )
</span><del>- add_meta_box( 'formatdiv', __('Format'), 'post_format_meta_box', $post_type, 'side', 'core' );
</del><ins>+ add_meta_box( 'formatdiv', _x( 'Format', 'post format' ), 'post_format_meta_box', $post_type, 'side', 'core' );
</ins><span class="cx">
</span><span class="cx"> // all taxonomies
</span><span class="cx"> foreach ( get_object_taxonomies($post_type) as $tax_name ) {
</span></span></pre></div>
<a id="branches31wpincludestaxonomyphp"></a>
<div class="modfile"><h4>Modified: branches/3.1/wp-includes/taxonomy.php (17372 => 17373)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.1/wp-includes/taxonomy.php 2011-01-31 12:18:57 UTC (rev 17372)
+++ branches/3.1/wp-includes/taxonomy.php 2011-01-31 14:44:33 UTC (rev 17373)
</span><span class="lines">@@ -87,8 +87,8 @@
</span><span class="cx"> 'public' => true,
</span><span class="cx"> 'hierarchical' => false,
</span><span class="cx"> 'labels' => array(
</span><del>- 'name' => __( 'Format' ),
- 'singular_name' => __( 'Format' ),
</del><ins>+ 'name' => _x( 'Format', 'post format' ),
+ 'singular_name' => _x( 'Format', 'post format' ),
</ins><span class="cx"> ),
</span><span class="cx"> 'query_var' => true,
</span><span class="cx"> 'rewrite' => $rewrite,
</span></span></pre>
</div>
</div>
</body>
</html>