<!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' => 45, 'orderby' => 'count', 'order' => '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->no_tagcloud ) ? $tax->no_tagcloud : __('No tags found!') );
+ }
</ins><span class="cx">
</span><span class="cx"> if ( is_wp_error($tags) )
</span><span class="cx"> die($tags->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->assign_cap) ) // @todo: Display the terms, do not edit.
</span><span class="cx"> return;
</span><del>- $helps = isset($taxonomy->helps) ? esc_attr($taxonomy->helps) : __('Separate tags with commas.');
</del><ins>+ $helps = isset( $taxonomy->helps ) ? esc_attr( $taxonomy->helps ) : esc_attr__('Separate tags with commas.');
+ $help_hint = isset( $taxonomy->help_hint ) ? $taxonomy->help_hint : __('Add new tag');
+ $help_nojs = isset( $taxonomy->help_nojs ) ? $taxonomy->help_nojs : __('Add or remove tags');
+ $help_cloud = isset( $taxonomy->help_cloud ) ? $taxonomy->help_cloud : __('Choose from the most used tags in %s');
</ins><span class="cx"> ?>
</span><span class="cx"> <div class="tagsdiv" id="<?php echo $tax_name; ?>">
</span><span class="cx"> <div class="jaxtag">
</span><span class="cx"> <div class="nojs-tags hide-if-js">
</span><del>- <p><?php _e('Add or remove tags'); ?></p>
</del><ins>+ <p><?php echo $help_nojs; ?></p>
</ins><span class="cx"> <textarea name="<?php echo "tax_input[$tax_name]"; ?>" class="the-tags" id="tax-input[<?php echo $tax_name; ?>]"><?php echo esc_attr(get_terms_to_edit( $post->ID, $tax_name )); ?></textarea></div>
</span><span class="cx">
</span><span class="cx"> <div class="ajaxtag hide-if-no-js">
</span><span class="cx"> <label class="screen-reader-text" for="new-tag-<?php echo $tax_name; ?>"><?php echo $box['title']; ?></label>
</span><del>- <div class="taghint"><?php _e('Add new tag'); ?></div>
</del><ins>+ <div class="taghint"><?php echo $help_hint; ?></div>
</ins><span class="cx"> <input type="text" id="new-tag-<?php echo $tax_name; ?>" name="newtag[<?php echo $tax_name; ?>]" class="newtag form-input-tip" size="16" autocomplete="off" value="" />
</span><span class="cx"> <input type="button" class="button tagadd" value="<?php esc_attr_e('Add'); ?>" tabindex="3" />
</span><span class="cx"> </div></div>
</span><span class="cx"> <p class="howto"><?php echo $helps; ?></p>
</span><span class="cx"> <div class="tagchecklist"></div>
</span><span class="cx"> </div>
</span><del>-<p class="hide-if-no-js"><a href="#titlediv" class="tagcloud-link" id="link-<?php echo $tax_name; ?>"><?php printf( __('Choose from the most used tags in %s'), $box['title'] ); ?></a></p>
</del><ins>+<p class="hide-if-no-js"><a href="#titlediv" class="tagcloud-link" id="link-<?php echo $tax_name; ?>"><?php printf( $help_cloud, $box['title'] ); ?></a></p>
</ins><span class="cx"> <?php
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>