Changeset 8781

Timestamp:

08/10/2014 05:27:52 PM (10 years ago)

Author:

djpaul

Message:

Improve pagination label strings for all components

“Viewing 1 site” reads better than “Viewing site 1 to 1 (of 1 site)”,
regardless of the language you’re using.

Fixes #5767

Location:

trunk/src

Files:

• bp-activity/bp-activity-template.php (modified) (1 diff)
• bp-blogs/bp-blogs-template.php (modified) (1 diff)
• bp-forums/bp-forums-template.php (modified) (2 diffs)
• bp-groups/bp-groups-template.php (modified) (4 diffs)
• bp-members/bp-members-template.php (modified) (1 diff)
• bp-messages/bp-messages-template.php (modified) (1 diff)
• bp-notifications/bp-notifications-template.php (modified) (1 diff)

trunk/src/bp-activity/bp-activity-template.php

@@ -769 +769 @@
         $total     = bp_core_number_format( $activities_template->total_activity_count );
 
-        return sprintf( _n( 'Viewing item %1$s to %2$s (of %3$s item)', 'Viewing item %1$s to %2$s (of %3$s items)', $total, 'buddypress' ), $from_num, $to_num, $total );
+        return sprintf( _n( 'Viewing 1 item', 'Viewing %1$s - %2$s of %3$s items', $total, 'buddypress' ), $from_num, $to_num, $total );
     }
 

trunk/src/bp-blogs/bp-blogs-template.php

@@ -427 +427 @@
     $total     = bp_core_number_format( $blogs_template->total_blog_count );
 
-    echo sprintf( _n( 'Viewing site %1$s to %2$s (of %3$s site)', 'Viewing site %1$s to %2$s (of %3$s sites)', $total, 'buddypress' ), $from_num, $to_num, $total );
+    echo sprintf( _n( 'Viewing 1 site', 'Viewing %1$s - %2$s of %3$s sites', $total, 'buddypress' ), $from_num, $to_num, $total );
 }
 

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

@@ -1525 +1525 @@
             $pag_filter = sprintf( __( ' matching tag "%s"', 'buddypress' ), $forum_template->search_terms );
 
-        return apply_filters( 'bp_get_forum_pagination_count', sprintf( _n( 'Viewing topic %s to %s (of %d topic%s)', 'Viewing topic %s to %s (of %d total topics%s)', $total, 'buddypress' ), $from_num, $to_num, $total, $pag_filter ), $from_num, $to_num, $total );
+        return apply_filters( 'bp_get_forum_pagination_count', sprintf( _n( 'Viewing 1 topic', 'Viewing %1$s - %2$s of %3$s topics', $total, 'buddypress' ), $from_num, $to_num, $total, $pag_filter ), $from_num, $to_num, $total );
     }
 
@@ -2164 +2164 @@
     $total = bp_core_number_format( $topic_template->total_post_count );
 
-    echo apply_filters( 'bp_the_topic_pagination_count', sprintf( _n( 'Viewing post %1$s to %2$s (%3$s post)', 'Viewing post %1$s to %2$s (%3$s total posts)', $total, 'buddypress' ), $from_num, $to_num, $total ), $from_num, $to_num, $total );
+    echo apply_filters( 'bp_the_topic_pagination_count', sprintf( _n( 'Viewing 1 post', 'Viewing %1$s - %2$s of %3$s posts', $total, 'buddypress' ), $from_num, $to_num, $total ), $from_num, $to_num, $total );
 }
 

trunk/src/bp-groups/bp-groups-template.php

@@ -1089 +1089 @@
         $total     = bp_core_number_format( $groups_template->total_group_count );
 
-        return apply_filters( 'bp_get_groups_pagination_count', sprintf( _n( 'Viewing group %1$s to %2$s (of %3$s group)', 'Viewing group %1$s to %2$s (of %3$s groups)', $total, 'buddypress' ), $from_num, $to_num, $total ), $from_num, $to_num, $total );
+        return apply_filters( 'bp_get_groups_pagination_count', sprintf( _n( 'Viewing 1', 'Viewing %1$s - %2$s of %3$s groups', $total, 'buddypress' ), $from_num, $to_num, $total ), $from_num, $to_num, $total );
     }
 
@@ -2587 +2587 @@
         $total = bp_core_number_format( $members_template->total_member_count );
 
-        return apply_filters( 'bp_get_group_member_pagination_count', sprintf( _n( 'Viewing member %1$s to %2$s (of %3$s member)', 'Viewing members %1$s to %2$s (of %3$s members)', $total, 'buddypress' ), $from_num, $to_num, $total ), $from_num, $to_num, $total );
+        return apply_filters( 'bp_get_group_member_pagination_count', sprintf( _n( 'Viewing 1 member', 'Viewing %1$s - %2$s of %3$s members', $total, 'buddypress' ), $from_num, $to_num, $total ), $from_num, $to_num, $total );
     }
 
@@ -3465 +3465 @@
         $total     = bp_core_number_format( $requests_template->total_request_count );
 
-        return apply_filters( 'bp_get_group_requests_pagination_count', sprintf( _n( 'Viewing requests %1$s to %2$s (of %3$s request)', 'Viewing request %1$s to %2$s (of %3$s requests)', $total, 'buddypress' ), $from_num, $to_num, $total ), $from_num, $to_num, $total );
+        return apply_filters( 'bp_get_group_requests_pagination_count', sprintf( _n( 'Viewing 1 request', 'Viewing %1$s - %2$s of %3$s requests', $total, 'buddypress' ), $from_num, $to_num, $total ), $from_num, $to_num, $total );
     }
 
@@ -3760 +3760 @@
         $total     = bp_core_number_format( $invites_template->total_invite_count );
 
-        return apply_filters( 'bp_get_groups_pagination_count', sprintf( _n( 'Viewing invitation %1$s to %2$s (of %3$s invitation)', 'Viewing invitation %1$s to %2$s (of %3$s invitations)', $total, 'buddypress' ), $from_num, $to_num, $total ), $from_num, $to_num, $total );
+        return apply_filters( 'bp_get_groups_pagination_count', sprintf( _n( 'Viewing 1 invitation', 'Viewing %1$s - %2$s of %3$s invitations', $total, 'buddypress' ), $from_num, $to_num, $total ), $from_num, $to_num, $total );
     }
 

trunk/src/bp-members/bp-members-template.php

@@ -514 +514 @@
 
         if ( 'active' == $members_template->type )
-            $pag = sprintf( _n( 'Viewing member %1$s to %2$s (of %3$s active member)', 'Viewing member %1$s to %2$s (of %3$s active members)', $members_template->total_member_count, 'buddypress' ), $from_num, $to_num, $total );
+            $pag = sprintf( _n( 'Viewing 1 active member', 'Viewing %1$s - %2$s of %3$s active members', $members_template->total_member_count, 'buddypress' ), $from_num, $to_num, $total );
         else if ( 'popular' == $members_template->type )
-            $pag = sprintf( _n( 'Viewing member %1$s to %2$s (of %3$s member with friends)', 'Viewing member %1$s to %2$s (of %3$s members with friends)', $members_template->total_member_count, 'buddypress' ), $from_num, $to_num, $total );
+            $pag = sprintf( _n( 'Viewing 1 member with friends', 'Viewing %1$s - %2$s of %3$s members with friends', $members_template->total_member_count, 'buddypress' ), $from_num, $to_num, $total );
         else if ( 'online' == $members_template->type )
-            $pag = sprintf( _n( 'Viewing member %1$s to %2$s (of %3$s member online)', 'Viewing member %1$s to %2$s (of %3$s members online)', $members_template->total_member_count, 'buddypress' ), $from_num, $to_num, $total );
+            $pag = sprintf( _n( 'Viewing 1 online member', 'Viewing %1$s - %2$s of %3$s online members', $members_template->total_member_count, 'buddypress' ), $from_num, $to_num, $total );
         else
-            $pag = sprintf( _n( 'Viewing member %1$s to %2$s (of %3$s member)', 'Viewing member %1$s to %2$s (of %3$s members)', $members_template->total_member_count, 'buddypress' ), $from_num, $to_num, $total );
+            $pag = sprintf( _n( 'Viewing 1 member', 'Viewing %1$s - %2$s of %3$s members', $members_template->total_member_count, 'buddypress' ), $from_num, $to_num, $total );
 
         return apply_filters( 'bp_members_pagination_count', $pag );

trunk/src/bp-messages/bp-messages-template.php

@@ -718 +718 @@
     $total = bp_core_number_format( $messages_template->total_thread_count );
 
-    echo sprintf( _n( 'Viewing message %1$s to %2$s (of %3$s message)', 'Viewing message %1$s to %2$s (of %3$s messages)', $total, 'buddypress' ), $from_num, $to_num, number_format_i18n( $total ) );
+    echo sprintf( _n( 'Viewing 1 message', 'Viewing %1$s - %2$s of %3$s messages', $total, 'buddypress' ), $from_num, $to_num, number_format_i18n( $total ) );
 }
 

trunk/src/bp-notifications/bp-notifications-template.php

@@ -991 +991 @@
         $to_num     = bp_core_number_format( ( $start_num + ( $query_loop->pag_num - 1 ) > $query_loop->total_notification_count ) ? $query_loop->total_notification_count : $start_num + ( $query_loop->pag_num - 1 ) );
         $total      = bp_core_number_format( $query_loop->total_notification_count );
-        $pag        = sprintf( _n( 'Viewing %1$s to %2$s (of %3$s notification)', 'Viewing %1$s to %2$s (of %3$s notifications)', $total, 'buddypress' ), $from_num, $to_num, $total );
+        $pag        = sprintf( _n( 'Viewing 1 notification', 'Viewing %1$s - %2$s of %3$s notifications', $total, 'buddypress' ), $from_num, $to_num, $total );
 
         return apply_filters( 'bp_notifications_pagination_count', $pag );