<!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>[27376] trunk/src/wp-includes: Accept nooped plurals in wp_generate_tag_cloud() / wp_tag_cloud().</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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/27376">27376</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2014-03-03 17:28:07 +0000 (Mon, 03 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Accept nooped plurals in wp_generate_tag_cloud() / wp_tag_cloud().
Renders topic_count_text_callback more or less obsolete. It can still be used, but passing a plural is easier.
fixes <a href="http://core.trac.wordpress.org/ticket/27262">#27262</a>. see <a href="http://core.trac.wordpress.org/ticket/7989">#7989</a>, <a href="http://core.trac.wordpress.org/ticket/14424">#14424</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludescategorytemplatephp">trunk/src/wp-includes/category-template.php</a></li>
<li><a href="#trunksrcwpincludesdeprecatedphp">trunk/src/wp-includes/deprecated.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludescategorytemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/category-template.php (27375 => 27376)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/category-template.php 2014-03-03 17:19:31 UTC (rev 27375)
+++ trunk/src/wp-includes/category-template.php 2014-03-03 17:28:07 UTC (rev 27376)
</span><span class="lines">@@ -515,9 +515,12 @@
</span><span class="cx"> * The 'number' argument is how many tags to return. By default, the limit will
</span><span class="cx"> * be to return the top 45 tags in the tag cloud list.
</span><span class="cx"> *
</span><del>- * The 'topic_count_text_callback' argument is a function, which, given the count
- * of the posts with that tag, returns a text for the tooltip of the tag link.
</del><ins>+ * The 'topic_count_text' argument is a nooped plural from _n_noop() to generate the
+ * text for the tooltip of the tag link.
</ins><span class="cx"> *
</span><ins>+ * The 'topic_count_text_callback' argument is a function, which given the count
+ * of the posts with that tag returns a text for the tooltip of the tag link.
+ *
</ins><span class="cx"> * The 'exclude' and 'include' arguments are used for the {@link get_tags()}
</span><span class="cx"> * function. Only one should be used, because only one will be used and the
</span><span class="cx"> * other ignored, if they are both set.
</span><span class="lines">@@ -563,16 +566,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Default text for tooltip for tag links
- *
- * @param integer $count number of posts with that tag
- * @return string text for the tooltip of a tag link.
- */
-function default_topic_count_text( $count ) {
- return sprintf( _n('%s topic', '%s topics', $count), number_format_i18n( $count ) );
-}
-
-/**
</del><span class="cx"> * Default topic count scaling for tag links
</span><span class="cx"> *
</span><span class="cx"> * @param integer $count number of posts with that tag
</span><span class="lines">@@ -603,8 +596,11 @@
</span><span class="cx"> * The 'number' argument is how many tags to return. By default, the limit will
</span><span class="cx"> * be to return the entire tag cloud list.
</span><span class="cx"> *
</span><ins>+ * The 'topic_count_text' argument is a nooped plural from _n_noop() to generate the
+ * text for the tooltip of the tag link.
+ *
</ins><span class="cx"> * The 'topic_count_text_callback' argument is a function, which given the count
</span><del>- * of the posts with that tag returns a text for the tooltip of the tag link.
</del><ins>+ * of the posts with that tag returns a text for the tooltip of the tag link.
</ins><span class="cx"> *
</span><span class="cx"> * @todo Complete functionality.
</span><span class="cx"> * @since 2.3.0
</span><span class="lines">@@ -617,20 +613,35 @@
</span><span class="cx"> $defaults = array(
</span><span class="cx"> 'smallest' => 8, 'largest' => 22, 'unit' => 'pt', 'number' => 0,
</span><span class="cx"> 'format' => 'flat', 'separator' => "\n", 'orderby' => 'name', 'order' => 'ASC',
</span><del>- 'topic_count_text_callback' => 'default_topic_count_text',
</del><ins>+ 'topic_count_text' => null, 'topic_count_text_callback' => null,
</ins><span class="cx"> 'topic_count_scale_callback' => 'default_topic_count_scale', 'filter' => 1,
</span><span class="cx"> );
</span><span class="cx">
</span><del>- if ( !isset( $args['topic_count_text_callback'] ) && isset( $args['single_text'] ) && isset( $args['multiple_text'] ) ) {
- $args['topic_count_text_callback'] = '_plugin_topic_count';
- }
-
</del><span class="cx"> $args = wp_parse_args( $args, $defaults );
</span><del>- extract( $args );
</del><ins>+ extract( $args, EXTR_SKIP );
</ins><span class="cx">
</span><span class="cx"> if ( empty( $tags ) )
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ // Juggle topic count tooltips:
+ if ( isset( $args['topic_count_text'] ) ) {
+ // First look for nooped plural support via topic_count_text.
+ $translate_nooped_plural = $args['topic_count_text'];
+ } elseif ( ! empty( $args['topic_count_text_callback'] ) ) {
+ // Look for the alternative callback style. Ignore the previous default.
+ if ( $args['topic_count_text_callback'] === 'default_topic_count_text' ) {
+ $translate_nooped_plural = _n_noop( '%s topic', '%s topics' );
+ } else {
+ $translate_nooped_plural = false;
+ }
+ } elseif ( isset( $args['single_text'] ) && isset( $args['multiple_text'] ) ) {
+ // If no callback exists, look for the old-style single_text and multiple_text arguments.
+ $translate_nooped_plural = _n_noop( $args['single_text'], $args['multiple_text'] );
+ } else {
+ // This is the default for when no callback, plural, or argument is passed in.
+ $translate_nooped_plural = _n_noop( '%s topic', '%s topics' );
+ }
+
</ins><span class="cx"> $tags_sorted = apply_filters( 'tag_cloud_sort', $tags, $args );
</span><span class="cx"> if ( $tags_sorted != $tags ) { // the tags have been sorted by a plugin
</span><span class="cx"> $tags = $tags_sorted;
</span><span class="lines">@@ -677,7 +688,14 @@
</span><span class="cx"> $tag_link = '#' != $tag->link ? esc_url( $tag->link ) : '#';
</span><span class="cx"> $tag_id = isset($tags[ $key ]->id) ? $tags[ $key ]->id : $key;
</span><span class="cx"> $tag_name = $tags[ $key ]->name;
</span><del>- $a[] = "<a href='$tag_link' class='tag-link-$tag_id' title='" . esc_attr( call_user_func( $topic_count_text_callback, $real_count, $tag, $args ) ) . "' style='font-size: " .
</del><ins>+
+ if ( $translate_nooped_plural ) {
+ $title_attribute = sprintf( translate_nooped_plural( $translate_nooped_plural, $real_count ), number_format_i18n( $real_count ) );
+ } else {
+ $title_attribute = call_user_func( $topic_count_text_callback, $real_count, $tag, $args );
+ }
+
+ $a[] = "<a href='$tag_link' class='tag-link-$tag_id' title='" . esc_attr( $title_attribute ) . "' style='font-size: " .
</ins><span class="cx"> str_replace( ',', '.', ( $smallest + ( ( $count - $min_count ) * $font_step ) ) )
</span><span class="cx"> . "$unit;'>$tag_name</a>";
</span><span class="cx"> }
</span><span class="lines">@@ -722,21 +740,6 @@
</span><span class="cx"> return ( $a->count > $b->count );
</span><span class="cx"> }
</span><span class="cx">
</span><del>-/**
- * Default text for tooltip for tag links
- *
- * @since 3.9.0
- * @access private
- *
- * @param integer $count Number of posts with that tag.
- * @param object $tag Tag object.
- * @param array $args Arguments for the tag cloud.
- * @return string Text for the tooltip of a tag link.
- */
-function _plugin_topic_count( $count, $tag, $args ) {
- return sprintf( 1 == $count? $args['single_text'] : $args['multiple_text'], number_format_i18n( $count ) );
-}
-
</del><span class="cx"> //
</span><span class="cx"> // Helper functions
</span><span class="cx"> //
</span></span></pre></div>
<a id="trunksrcwpincludesdeprecatedphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/deprecated.php (27375 => 27376)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/deprecated.php 2014-03-03 17:19:31 UTC (rev 27375)
+++ trunk/src/wp-includes/deprecated.php 2014-03-03 17:28:07 UTC (rev 27376)
</span><span class="lines">@@ -3417,4 +3417,16 @@
</span><span class="cx"> * @since 2.6.0
</span><span class="cx"> * @deprecated 3.9.0
</span><span class="cx"> */
</span><del>-function wp_style_loader_src() {}
</del><span class="cx">\ No newline at end of file
</span><ins>+function wp_style_loader_src() {}
+
+
+/**
+ * Old callback for tag link tooltips.
+ *
+ * @since 2.7.0
+ * @deprecated 3.9.0
+ * @access private
+ */
+function default_topic_count_text( $count ) {
+ return $count;
+}
</ins></span></pre>
</div>
</div>
</body>
</html>