Changeset 10953

Timestamp:

04/16/2009 06:51:50 PM (16 years ago)

Author:

ryan

Message:

Translate defaults. Props nbachiyski. fixes #9548

File:

• trunk/wp-includes/comment-template.php (modified) (4 diffs)

trunk/wp-includes/comment-template.php

@@ -641 +641 @@
  * @param string $pingbacktxt The string to display for pingback type
  */
-function comment_type($commenttxt = 'Comment', $trackbacktxt = 'Trackback', $pingbacktxt = 'Pingback') {
+function comment_type($commenttxt = false, $trackbacktxt = false, $pingbacktxt = false) {
+    if ( false === $commenttxt ) $commenttxt = _x( 'Comment', 'noun' );
+    if ( false === $trackbacktxt ) $trackbacktxt = __( 'Trackback' );
+    if ( false === $pingbacktxt ) $pingbacktxt = __( 'Pingback' );
     $type = get_comment_type();
     switch( $type ) {
@@ -842 +845 @@
     }
 
-    define('COMMENTS_TEMPLATE', true);
+    if ( !defined('COMMENTS_TEMPLATE') || !COMMENTS_TEMPLATE)
+        define('COMMENTS_TEMPLATE', true);
 
     $include = apply_filters('comments_template', STYLESHEETPATH . $file );
@@ -903 +907 @@
  * @return null Returns null on single posts and pages.
  */
-function comments_popup_link( $zero = 'No Comments', $one = '1 Comment', $more = '% Comments', $css_class = '', $none = 'Comments Off' ) {
+function comments_popup_link( $zero = false, $one = false, $more = false, $css_class = '', $none = false ) {
     global $id, $wpcommentspopupfile, $wpcommentsjavascript, $post;
-
+    
+    if ( false === $zero ) $zero = __( 'No Comments' );
+    if ( false === $one ) $one = __( '1 Comment' );
+    if ( false === $more ) $more = __( '% Comments' );
+    if ( false === $none ) $none = __( 'Comments Off' );
+    
     $number = get_comments_number( $id );
 
@@ -1105 +1114 @@
  * @param string $linktoparent Optional. Boolean to control making the author's name a link to their comment.
  */
-function comment_form_title( $noreplytext = 'Leave a Reply', $replytext = 'Leave a Reply to %s', $linktoparent = TRUE ) {
+function comment_form_title( $noreplytext = false, $replytext = false, $linktoparent = TRUE ) {
     global $comment;
+    
+    if ( false === $noreplytext ) $noreplytext = __( 'Leave a Reply' );
+    if ( false === $replytext ) $replytext = __( 'Leave a Reply to %s' );
 
     $replytoid = isset($_GET['replytocom']) ? (int) $_GET['replytocom'] : 0;