Changeset 9834

Timestamp:

11/21/2008 06:12:57 PM (16 years ago)

Author:

westi

Message:

Ensure tag cloud topic(s) tooltips can be translated. Fixes #7989 props nbachiyski.

File:

• trunk/wp-includes/category-template.php (modified) (5 diffs)

trunk/wp-includes/category-template.php

@@ -537 +537 @@
  * 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
- * for the tag link. If the tag only has one, it will use the text in the
- * 'single_text' or if it has more than one it will use 'multiple_text' instead.
+* 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.
+ * @see default_topic_count_text
  *
  * The 'exclude' and 'include' arguments are used for the {@link get_tags()}
@@ -586 +586 @@
 
 /**
+ * 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.
  *
@@ -602 +612 @@
  * be to return the entire tag cloud list.
  *
- * The 'single_text' and 'multiple_text' arguments are used for the link title
- * for the tag link. If the tag only has one, it will use the text in the
- * 'single_text' or if it has more than one it will use 'multiple_text' instead.
+ * 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.
+ * @see default_topic_count_text 
+ * 
  *
  * @todo Complete functionality.
@@ -618 +629 @@
         'smallest' => 8, 'largest' => 22, 'unit' => 'pt', 'number' => 0,
         '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 );
+        
     extract( $args );
 
@@ -667 +687 @@
         $tag_id = isset($tags[ $key ]->id) ? $tags[ $key ]->id : $key;
         $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 ) )
             . "$unit;'>$tag_name</a>";