<!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>[13538] trunk/wp-admin:
  Add some custom taxonomy flags to allow fully customize strings in the taxonomy meta box
 .</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13538">13538</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-03-01 21:04:37 +0000 (Mon, 01 Mar 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>Add some custom taxonomy flags to allow fully customize strings in the taxonomy meta box. see <a href="http://trac.wordpress.org/ticket/11838">#11838</a></pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminadminajaxphp">trunk/wp-admin/admin-ajax.php</a></li>
<li><a href="#trunkwpadminincludesmetaboxesphp">trunk/wp-admin/includes/meta-boxes.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminadminajaxphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/admin-ajax.php (13537 => 13538)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/admin-ajax.php        2010-03-01 20:33:03 UTC (rev 13537)
+++ trunk/wp-admin/admin-ajax.php        2010-03-01 21:04:37 UTC (rev 13538)
</span><span class="lines">@@ -620,8 +620,10 @@
</span><span class="cx"> 
</span><span class="cx">         $tags = get_terms( $taxonomy, array( 'number' =&gt; 45, 'orderby' =&gt; 'count', 'order' =&gt; 'DESC' ) );
</span><span class="cx"> 
</span><del>-        if ( empty( $tags ) )
-                die( __('No tags found!') );
</del><ins>+        if ( empty( $tags ) ) {
+                $tax = get_taxonomy( $taxonomy );
+                die( isset( $tax-&gt;no_tagcloud ) ? $tax-&gt;no_tagcloud : __('No tags found!') );
+        }
</ins><span class="cx"> 
</span><span class="cx">         if ( is_wp_error($tags) )
</span><span class="cx">                 die($tags-&gt;get_error_message());
</span></span></pre></div>
<a id="trunkwpadminincludesmetaboxesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/meta-boxes.php (13537 => 13538)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/meta-boxes.php        2010-03-01 20:33:03 UTC (rev 13537)
+++ trunk/wp-admin/includes/meta-boxes.php        2010-03-01 21:04:37 UTC (rev 13538)
</span><span class="lines">@@ -249,24 +249,27 @@
</span><span class="cx">         $taxonomy = get_taxonomy($tax_name);
</span><span class="cx">         if ( !current_user_can($taxonomy-&gt;assign_cap) ) // @todo: Display the terms, do not edit.
</span><span class="cx">                 return;
</span><del>-        $helps = isset($taxonomy-&gt;helps) ? esc_attr($taxonomy-&gt;helps) : __('Separate tags with commas.');
</del><ins>+        $helps      = isset( $taxonomy-&gt;helps      ) ? esc_attr( $taxonomy-&gt;helps ) : esc_attr__('Separate tags with commas.');
+        $help_hint  = isset( $taxonomy-&gt;help_hint  ) ? $taxonomy-&gt;help_hint         : __('Add new tag');
+        $help_nojs  = isset( $taxonomy-&gt;help_nojs  ) ? $taxonomy-&gt;help_nojs         : __('Add or remove tags');
+        $help_cloud = isset( $taxonomy-&gt;help_cloud ) ? $taxonomy-&gt;help_cloud        : __('Choose from the most used tags in %s');
</ins><span class="cx"> ?&gt;
</span><span class="cx"> &lt;div class=&quot;tagsdiv&quot; id=&quot;&lt;?php echo $tax_name; ?&gt;&quot;&gt;
</span><span class="cx">         &lt;div class=&quot;jaxtag&quot;&gt;
</span><span class="cx">         &lt;div class=&quot;nojs-tags hide-if-js&quot;&gt;
</span><del>-        &lt;p&gt;&lt;?php _e('Add or remove tags'); ?&gt;&lt;/p&gt;
</del><ins>+        &lt;p&gt;&lt;?php echo $help_nojs; ?&gt;&lt;/p&gt;
</ins><span class="cx">         &lt;textarea name=&quot;&lt;?php echo &quot;tax_input[$tax_name]&quot;; ?&gt;&quot; class=&quot;the-tags&quot; id=&quot;tax-input[&lt;?php echo $tax_name; ?&gt;]&quot;&gt;&lt;?php echo esc_attr(get_terms_to_edit( $post-&gt;ID, $tax_name )); ?&gt;&lt;/textarea&gt;&lt;/div&gt;
</span><span class="cx"> 
</span><span class="cx">         &lt;div class=&quot;ajaxtag hide-if-no-js&quot;&gt;
</span><span class="cx">                 &lt;label class=&quot;screen-reader-text&quot; for=&quot;new-tag-&lt;?php echo $tax_name; ?&gt;&quot;&gt;&lt;?php echo $box['title']; ?&gt;&lt;/label&gt;
</span><del>-                &lt;div class=&quot;taghint&quot;&gt;&lt;?php _e('Add new tag'); ?&gt;&lt;/div&gt;
</del><ins>+                &lt;div class=&quot;taghint&quot;&gt;&lt;?php echo $help_hint; ?&gt;&lt;/div&gt;
</ins><span class="cx">                 &lt;input type=&quot;text&quot; id=&quot;new-tag-&lt;?php echo $tax_name; ?&gt;&quot; name=&quot;newtag[&lt;?php echo $tax_name; ?&gt;]&quot; class=&quot;newtag form-input-tip&quot; size=&quot;16&quot; autocomplete=&quot;off&quot; value=&quot;&quot; /&gt;
</span><span class="cx">                 &lt;input type=&quot;button&quot; class=&quot;button tagadd&quot; value=&quot;&lt;?php esc_attr_e('Add'); ?&gt;&quot; tabindex=&quot;3&quot; /&gt;
</span><span class="cx">         &lt;/div&gt;&lt;/div&gt;
</span><span class="cx">         &lt;p class=&quot;howto&quot;&gt;&lt;?php echo $helps; ?&gt;&lt;/p&gt;
</span><span class="cx">         &lt;div class=&quot;tagchecklist&quot;&gt;&lt;/div&gt;
</span><span class="cx"> &lt;/div&gt;
</span><del>-&lt;p class=&quot;hide-if-no-js&quot;&gt;&lt;a href=&quot;#titlediv&quot; class=&quot;tagcloud-link&quot; id=&quot;link-&lt;?php echo $tax_name; ?&gt;&quot;&gt;&lt;?php printf( __('Choose from the most used tags in %s'), $box['title'] ); ?&gt;&lt;/a&gt;&lt;/p&gt;
</del><ins>+&lt;p class=&quot;hide-if-no-js&quot;&gt;&lt;a href=&quot;#titlediv&quot; class=&quot;tagcloud-link&quot; id=&quot;link-&lt;?php echo $tax_name; ?&gt;&quot;&gt;&lt;?php printf( $help_cloud, $box['title'] ); ?&gt;&lt;/a&gt;&lt;/p&gt;
</ins><span class="cx"> &lt;?php
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>