Ensure tag cloud topic(s) tooltips can be translated. Fixes #7989 props nbachiyski.
git-svn-id: https://develop.svn.wordpress.org/trunk@9834 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
parent
cc2ad7b801
commit
7015a56598
|
@ -536,9 +536,9 @@ function wp_list_categories( $args = '' ) {
|
||||||
* The 'number' argument is how many tags to return. By default, the limit will
|
* The 'number' argument is how many tags to return. By default, the limit will
|
||||||
* be to return the top 45 tags in the tag cloud list.
|
* be to return the top 45 tags in the tag cloud list.
|
||||||
*
|
*
|
||||||
* The 'single_text' and 'multiple_text' arguments are used for the link title
|
* The 'topic_count_text_callback' argument is a function, which, given the count
|
||||||
* for the tag link. If the tag only has one, it will use the text in the
|
* of the posts with that tag, returns a text for the tooltip of the tag link.
|
||||||
* 'single_text' or if it has more than one it will use 'multiple_text' instead.
|
* @see default_topic_count_text
|
||||||
*
|
*
|
||||||
* The 'exclude' and 'include' arguments are used for the {@link get_tags()}
|
* The 'exclude' and 'include' arguments are used for the {@link get_tags()}
|
||||||
* function. Only one should be used, because only one will be used and the
|
* function. Only one should be used, because only one will be used and the
|
||||||
|
@ -584,6 +584,16 @@ function wp_tag_cloud( $args = '' ) {
|
||||||
echo $return;
|
echo $return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 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( __ngettext('%s topic', '%s topics', $count), number_format_i18n( $count ) );
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Generates a tag cloud (heatmap) from provided data.
|
* Generates a tag cloud (heatmap) from provided data.
|
||||||
*
|
*
|
||||||
|
@ -601,9 +611,10 @@ function wp_tag_cloud( $args = '' ) {
|
||||||
* The 'number' argument is how many tags to return. By default, the limit will
|
* The 'number' argument is how many tags to return. By default, the limit will
|
||||||
* be to return the entire tag cloud list.
|
* be to return the entire tag cloud list.
|
||||||
*
|
*
|
||||||
* The 'single_text' and 'multiple_text' arguments are used for the link title
|
* The 'topic_count_text_callback' argument is a function, which given the count
|
||||||
* for the tag link. If the tag only has one, it will use the text in the
|
* of the posts with that tag returns a text for the tooltip of the tag link.
|
||||||
* 'single_text' or if it has more than one it will use 'multiple_text' instead.
|
* @see default_topic_count_text
|
||||||
|
*
|
||||||
*
|
*
|
||||||
* @todo Complete functionality.
|
* @todo Complete functionality.
|
||||||
* @since 2.3.0
|
* @since 2.3.0
|
||||||
|
@ -617,9 +628,18 @@ function wp_generate_tag_cloud( $tags, $args = '' ) {
|
||||||
$defaults = array(
|
$defaults = array(
|
||||||
'smallest' => 8, 'largest' => 22, 'unit' => 'pt', 'number' => 0,
|
'smallest' => 8, 'largest' => 22, 'unit' => 'pt', 'number' => 0,
|
||||||
'format' => 'flat', 'orderby' => 'name', 'order' => 'ASC',
|
'format' => 'flat', 'orderby' => 'name', 'order' => 'ASC',
|
||||||
'single_text' => '%d topic', 'multiple_text' => '%d topics'
|
'topic_count_text_callback' => 'default_topic_count_text',
|
||||||
);
|
);
|
||||||
|
|
||||||
|
if ( !isset( $args['topic_count_text_callback'] ) && isset( $args['single_text'] ) && isset( $args['multiple_text'] ) ) {
|
||||||
|
$body = 'return sprintf (
|
||||||
|
__ngettext('.var_export($args['single_text'], true).', '.var_export($args['multiple_text'], true).', $count),
|
||||||
|
number_format_i18n( $count ));';
|
||||||
|
$args['topic_count_text_callback'] = create_function('$count', $body);
|
||||||
|
}
|
||||||
|
|
||||||
$args = wp_parse_args( $args, $defaults );
|
$args = wp_parse_args( $args, $defaults );
|
||||||
|
|
||||||
extract( $args );
|
extract( $args );
|
||||||
|
|
||||||
if ( empty( $tags ) )
|
if ( empty( $tags ) )
|
||||||
|
@ -666,7 +686,7 @@ function wp_generate_tag_cloud( $tags, $args = '' ) {
|
||||||
$tag_link = '#' != $tag->link ? clean_url( $tag->link ) : '#';
|
$tag_link = '#' != $tag->link ? clean_url( $tag->link ) : '#';
|
||||||
$tag_id = isset($tags[ $key ]->id) ? $tags[ $key ]->id : $key;
|
$tag_id = isset($tags[ $key ]->id) ? $tags[ $key ]->id : $key;
|
||||||
$tag_name = $tags[ $key ]->name;
|
$tag_name = $tags[ $key ]->name;
|
||||||
$a[] = "<a href='$tag_link' class='tag-link-$tag_id' title='" . attribute_escape( sprintf( __ngettext( $single_text, $multiple_text, $count ), $count ) ) . "'$rel style='font-size: " .
|
$a[] = "<a href='$tag_link' class='tag-link-$tag_id' title='" . attribute_escape( $topic_count_text_callback( $count ) ) . "'$rel style='font-size: " .
|
||||||
( $smallest + ( ( $count - $min_count ) * $font_step ) )
|
( $smallest + ( ( $count - $min_count ) * $font_step ) )
|
||||||
. "$unit;'>$tag_name</a>";
|
. "$unit;'>$tag_name</a>";
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue