Changeset 4955 for trunk/bp-forums/bp-forums-template.php

Timestamp:

08/09/2011 06:40:20 PM (15 years ago)

Author:

djpaul

Message:

Fix pagination symbol i18n. Tidy whitespace. Fixes #3456, props r-a-y

File:

• trunk/bp-forums/bp-forums-template.php (modified) (21 diffs)

trunk/bp-forums/bp-forums-template.php

@@ -102 +102 @@
         }
 
-        function __construct( $type, $forum_id, $user_id, $page, $per_page, $max, $no_stickies, $search_terms, $offset = false, $number = false ) {     
+        function __construct( $type, $forum_id, $user_id, $page, $per_page, $max, $no_stickies, $search_terms, $offset = false, $number = false ) {
                 global $bp;
 
@@ -114 +114 @@
 
                 switch ( $type ) {
-                        case 'newest': default:                         
+                        case 'newest': default:
                                 $this->topics = bp_forums_get_forum_topics( array( 'user_id' => $user_id, 'forum_id' => $forum_id, 'filter' => $search_terms, 'page' => $this->pag_page, 'per_page' => $this->pag_num, 'show_stickies' => $no_stickies, 'offset' => $offset, 'number' => $number ) );
                                 break;
@@ -153 +153 @@
                                 $this->total_topic_count = (int)$max;
                         }
-                        
+
                         if ( $max ) {
                                 if ( $max >= count($this->topics) ) {
@@ -177 +177 @@
                                 'total'     => ceil( (int)$this->total_topic_count / (int)$this->pag_num),
                                 'current'   => $this->pag_page,
-                                'prev_text' => '←',
-                                'next_text' => '→',
+                                'prev_text' => _x( '←', 'Forum topic pagination previous text', 'buddypress' ),
+                                'next_text' => _x( '→', 'Forum topic pagination next text', 'buddypress' ),
                                 'mid_size'  => 1
                         ) );
@@ -261 +261 @@
         if ( !empty( $bp->displayed_user->id ) )
                 $user_id = $bp->displayed_user->id;
-        
+
         // "Replied" query must be manually modified
         if ( 'replies' == bp_current_action() ) {
                 $user_id = 0; // User id must be handled manually by the filter, not by BB_Query
-                
+
                 add_filter( 'get_topics_distinct',   'bp_forums_add_replied_distinct_sql', 20 );
                 add_filter( 'get_topics_join',       'bp_forums_add_replied_join_sql', 20 );
@@ -286 +286 @@
         if ( bp_is_directory() && !empty( $_GET['fs'] ) )
                 $search_terms = $_GET['fs'];
-        
+
         // Get the pagination arguments from $_REQUEST
         $page     = isset( $_REQUEST['p'] ) ? intval( $_REQUEST['p'] ) : 1;
         $per_page = isset( $_REQUEST['n'] ) ? intval( $_REQUEST['n'] ) : 20;
-        
+
         // Unless set otherwise, stickies appear in normal order on the global forum directory
         if ( bp_is_directory() && bp_is_forums_component() && !bp_forums_enable_global_directory_stickies() )
@@ -316 +316 @@
                 $type = 'tags';
         }
-        
+
         /** Sticky logic ******************************************************************/
-        
+
         if ( $do_stickies ) {
                 // Fetch the stickies
                 $stickies_template = new BP_Forums_Template_Forum( $type, $forum_id, $user_id, 0, 0, $max, 'sticky', $search_terms );
-                
+
                 // If stickies are found, try merging them
                 if ( $stickies_template->has_topics() ) {
-                
-                        // If stickies are for current $page            
+
+                        // If stickies are for current $page
                         $page_start_num = ( ( $page - 1 ) * $per_page ) + 1;
                         $page_end_num   = $page * $per_page <= $stickies_template->total_topic_count ? $page * $per_page : $stickies_template->total_topic_count;
-                        
+
                         // Calculate the number of sticky topics that will be shown on this page
                         if ( $stickies_template->topic_count < $page_start_num ) {
                                 $this_page_stickies = 0;
-                        } else {                        
+                        } else {
                                 $this_page_stickies = $stickies_template->topic_count - $per_page * floor( $stickies_template->topic_count / $per_page ) * ( $page - 1 ); // Total stickies minus sticky count through this page
-                                
+
                                 // $this_page_stickies cannot be more than $per_page or less than 0
                                 if ( $this_page_stickies > $per_page )
@@ -342 +342 @@
                                         $this_page_stickies = 0;
                         }
-                        
+
                         // Calculate the total number of topics that will be shown on this page
                         $this_page_topics = $stickies_template->total_topic_count >= ( $page * $per_page ) ? $per_page : $page_end_num - ( $page_start_num - 1 );
-                        
+
                         // If the number of stickies to be shown is less than $per_page, fetch some
                         // non-stickies to fill in the rest
@@ -351 +351 @@
                                 // How many non-stickies do we need?
                                 $non_sticky_number = $this_page_topics - $this_page_stickies;
-                                
-                                // Calculate the non-sticky offset                      
+
+                                // Calculate the non-sticky offset
                                 // How many non-stickies on all pages up to this point?
                                 $non_sticky_total = $page_end_num - $stickies_template->topic_count;
-                                
+
                                 // The offset is the number of total non-stickies, less the number
                                 // to be shown on this page
                                 $non_sticky_offset = $non_sticky_total - $non_sticky_number;
-                                
+
                                 // Fetch the non-stickies
                                 $forum_template = new BP_Forums_Template_Forum( $type, $forum_id, $user_id, 1, $per_page, $max, 'no', $search_terms, $non_sticky_offset, $non_sticky_number );
-                                
+
                                 // If there are stickies to merge on this page, do it now
                                 if ( $this_page_stickies ) {
                                         // Correct the topic_count
                                         $forum_template->topic_count += (int)$this_page_stickies;
-                                        
+
                                         // Figure out which stickies need to be included
                                         $this_page_sticky_topics = array_slice( $stickies_template->topics, 0 - $this_page_stickies );
-                                        
+
                                         // Merge these topics into the forum template
                                         $forum_template->topics = array_merge( $this_page_sticky_topics, (array)$forum_template->topics );
@@ -377 +377 @@
                                 // This page has no non-stickies
                                 $forum_template = $stickies_template;
-                                
+
                                 // Adjust the topic count and trim the topics
                                 $forum_template->topic_count = $this_page_stickies;
-                                $forum_template->topics      = array_slice( $forum_template->topics, $page - 1 );       
+                                $forum_template->topics      = array_slice( $forum_template->topics, $page - 1 );
                         }
-                                        
+
                         // Because we're using a manual offset and number for the topic query, we
                         // must set the page number manually, and recalculate the pagination links
                         $forum_template->pag_num     = $per_page;
                         $forum_template->pag_page    = $page;
-                        
+
                         $forum_template->pag_links = paginate_links( array(
                                 'base'      => add_query_arg( array( 'p' => '%#%', 'n' => $forum_template->pag_num ) ),
@@ -393 +393 @@
                                 'total'     => ceil( (int)$forum_template->total_topic_count / (int)$forum_template->pag_num ),
                                 'current'   => $forum_template->pag_page,
-                                'prev_text' => '&larr;',
-                                'next_text' => '&rarr;',
+                                'prev_text' => _x( '&larr;', 'Forum topic pagination previous text', 'buddypress' ),
+                                'next_text' => _x( '&rarr;', 'Forum topic pagination next text', 'buddypress' ),
                                 'mid_size'  => 1
                         ) );
-                        
+
                 } else {
                         // Fetch the non-sticky topics if no stickies were found
@@ -406 +406 @@
                 $forum_template = new BP_Forums_Template_Forum( $type, $forum_id, $user_id, $page, $per_page, $max, 'all', $search_terms );
         }
-                
+
         return apply_filters( 'bp_has_topics', $forum_template->has_topics(), $forum_template );
 }
@@ -865 +865 @@
 function bp_forums_tag_name() {
         echo bp_get_forums_tag_name();
-}       
+}
         /**
          * Outputs the currently viewed tag name
@@ -874 +874 @@
         function bp_get_forums_tag_name() {
                 $tag_name = bp_is_directory() && bp_is_forums_component() ? bp_action_variable( 0 ) : false;
-                
+
                 return apply_filters( 'bp_get_forums_tag_name', $tag_name );
         }
@@ -940 +940 @@
                 $this->__construct( $topic_id, $per_page, $max, $order );
         }
-                
+
         function __construct( $topic_id, $per_page, $max, $order ) {
                 global $bp, $current_user, $forum_template;
@@ -974 +974 @@
                         }
                 }
-                
+
                 // Load topic tags
                 $this->topic_tags = bb_get_topic_tags( $this->topic_id );
@@ -984 +984 @@
                                 'total'     => ceil( (int)$this->total_post_count / (int)$this->pag_num ),
                                 'current'   => $this->pag_page,
-                                'prev_text' => '&larr;',
-                                'next_text' => '&rarr;',
+                                'prev_text' => _x( '&larr;', 'Forum thread pagination previous text', 'buddypress' ),
+                                'next_text' => _x( '&rarr;', 'Forum thread pagination next text', 'buddypress' ),
                                 'mid_size'  => 1
                         ) );
@@ -1069 +1069 @@
                         return false;
         }
-        
+
         return apply_filters( 'bp_has_topic_posts', $topic_template->has_posts(), $topic_template );
 }
@@ -1335 +1335 @@
         function bp_get_forum_topic_tag_list( $format = 'string' ) {
                 global $topic_template;
-                
+
                 $tags_data = !empty( $topic_template->topic_tags ) ? $topic_template->topic_tags : false;
-                
+
                 $tags = array();
-                
+
                 if ( $tags_data ) {
                         foreach( $tags_data as $tag_data ) {
@@ -1345 +1345 @@
                         }
                 }
-                
+
                 if ( 'string' == $format )
                         $tags = implode( ', ', $tags );
-                        
+
                 return apply_filters( 'bp_forum_topic_tag_list', $tags, $format );
         }
@@ -1362 +1362 @@
 function bp_forum_topic_has_tags() {
         global $topic_template;
-        
+
         $has_tags = false;
-        
+
         if ( !empty( $topic_template->topic_tags ) )
                 $has_tags = true;
-        
+
         return apply_filters( 'bp_forum_topic_has_tags', $has_tags );
 }