Changeset 554

Timestamp:

11/18/2008 04:41:06 PM (16 years ago)

Author:

apeatling

Message:

Template tag updates to support translation in themes.

Location:

trunk

Files:

• bp-blogs/bp-blogs-templatetags.php (modified) (8 diffs)
• bp-groups/bp-groups-templatetags.php (modified) (2 diffs)

trunk/bp-blogs/bp-blogs-templatetags.php

@@ -221 +221 @@
 }
 
-function bp_post_title() {
-    global $posts_template;
-    echo $posts_template->post->post_title;
+function bp_post_title( $echo = true ) {
+    global $posts_template;
+    
+    if ( $echo )
+        echo $posts_template->post->post_title;
+    else
+        return $posts_template->post->post_title;
 }
 
@@ -249 +253 @@
 }
 
-function bp_post_date( $date_format = null ) {
+function bp_post_date( $date_format = null, $echo = true ) {
     global $posts_template;
     
@@ -255 +259 @@
         $date_format = get_option('date_format');
         
-    echo mysql2date( $date_format, $posts_template->post->post_date );
+    if ( $echo )
+        echo mysql2date( $date_format, $posts_template->post->post_date );
+    else
+        return mysql2date( $date_format, $posts_template->post->post_date );
 }
 
@@ -300 +307 @@
 }
 
-function bp_post_author() {
-    global $posts_template;
-    echo bp_core_get_userlink( $posts_template->post->post_author );    
+function bp_post_author( $echo = true ) {
+    global $posts_template;
+    
+    if ( $echo )
+        echo bp_core_get_userlink( $posts_template->post->post_author );
+    else
+        return bp_core_get_userlink( $posts_template->post->post_author );
 }
 
@@ -310 +321 @@
 }
 
-function bp_post_category( $separator = '', $parents='', $post_id = false ) {
-    global $posts_template;
-    echo get_the_category_list($separator, $parents, $posts_template->post->ID );   
+function bp_post_category( $separator = '', $parents='', $post_id = false, $echo = true ) {
+    global $posts_template;
+    
+    if ( $echo )
+        echo get_the_category_list( $separator, $parents, $posts_template->post->ID );
+    else
+        return get_the_category_list( $separator, $parents, $posts_template->post->ID );
 }
 
@@ -556 +571 @@
 }
 
-function bp_comment_post_permalink() {
-    global $comments_template;
-    echo bp_post_get_permalink( $comments_template->comment->post, $comments_template->comment->blog_id ) . '#comment-' . $comments_template->comment->comment_ID;
-}
-
-function bp_comment_post_title() {
-    global $comments_template;
-    echo $comments_template->comment->post->post_title;
-}
-
-function bp_comment_author() {
-    global $comments_template;  
-    echo bp_core_get_userlink( $comments_template->comment->user_id );
+function bp_comment_post_permalink( $echo = true ) {
+    global $comments_template;
+    
+    if ( $echo )
+        echo bp_post_get_permalink( $comments_template->comment->post, $comments_template->comment->blog_id ) . '#comment-' . $comments_template->comment->comment_ID;
+    else
+        return bp_post_get_permalink( $comments_template->comment->post, $comments_template->comment->blog_id ) . '#comment-' . $comments_template->comment->comment_ID;
+}
+
+function bp_comment_post_title( $echo = true ) {
+    global $comments_template;
+    
+    if ( $echo )
+        echo $comments_template->comment->post->post_title;
+    else
+        return $comments_template->comment->post->post_title;
+}
+
+function bp_comment_author( $echo = true ) {
+    global $comments_template;
+    
+    if ( $echo )
+        echo bp_core_get_userlink( $comments_template->comment->user_id );
+    else
+        return bp_core_get_userlink( $comments_template->comment->user_id );
 }
 
@@ -579 +606 @@
 }
 
-function bp_comment_date( $date_format = null ) {
+function bp_comment_date( $date_format = null, $echo = true ) {
     global $comments_template;
     
@@ -585 +612 @@
         $date_format = get_option('date_format');
         
-    echo mysql2date( $date_format, $comments_template->comment->post->post_date );
-}
-
-function bp_comment_blog_permalink() {
-    global $comments_template;
-    echo get_blog_option( $comments_template->comment->blog_id, 'siteurl' );
-}
-
-function bp_comment_blog_name() {
-    global $comments_template;
-    echo get_blog_option( $comments_template->comment->blog_id, 'blogname' );
+    if ( $echo == true )
+        echo mysql2date( $date_format, $comments_template->comment->post->post_date );
+    else 
+        return mysql2date( $date_format, $comments_template->comment->post->post_date );
+}
+
+function bp_comment_blog_permalink( $echo = true ) {
+    global $comments_template;
+    
+    if ( $echo )
+        echo get_blog_option( $comments_template->comment->blog_id, 'siteurl' );
+    else
+        return get_blog_option( $comments_template->comment->blog_id, 'siteurl' );
+}
+
+function bp_comment_blog_name( $echo = true ) {
+    global $comments_template;
+    
+    if ( $echo )
+        echo get_blog_option( $comments_template->comment->blog_id, 'blogname' );
+    else
+        return get_blog_option( $comments_template->comment->blog_id, 'blogname' );
 }
 

trunk/bp-groups/bp-groups-templatetags.php

@@ -365 +365 @@
 }
 
-function bp_group_all_members_permalink() {
+function bp_group_all_members_permalink( $echo = true ) {
     global $groups_template, $bp;
-    echo bp_group_permalink( false, true ) . '/' . MEMBERS_SLUG ;
+    
+    if ( $echo )
+        echo bp_group_permalink( false, true ) . '/' . MEMBERS_SLUG ;
+    else
+        return bp_group_permalink( false, false ) . '/' . MEMBERS_SLUG ;
 }
 
@@ -440 +444 @@
 }
 
-function bp_group_total_members() {
-    global $groups_template;
-    
-    echo $groups_template->group->total_member_count;
+function bp_group_total_members( $echo = true ) {
+    global $groups_template;
+    
+    if ( $echo )
+        echo $groups_template->group->total_member_count;
+    else
+        return $groups_template->group->total_member_count;
 }