Changeset 9765 for trunk/src/bp-forums/bp-forums-template.php

Timestamp:

04/17/2015 01:27:06 PM (10 years ago)

Author:

boonebgorges

Message:

Improved plural forms for localizable strings.

Strings that are intended for use only in the case of a single item should not
be bundled with strings intended for use with plurals, as this pattern does not
work with languages that use the singular nominal form for numbers other than
one. See ​https://core.trac.wordpress.org/ticket/28502#comment:23.

This changeset also fixes a few places where a formatted string, rather than a
raw integer, was being passed as the $count value to _n().

Props SergeyBiryukov.
Fixes #6368.

File:

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

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

@@ -1879 +1879 @@
             $pag_filter = sprintf( __( ' matching tag "%s"', 'buddypress' ), $forum_template->search_terms );
 
+        if ( 1 == $forum_template->total_topic_count ) {
+            $message = __( 'Viewing 1 topic', 'buddypress' );
+        } else {
+            $message = sprintf( _n( 'Viewing %1$s - %2$s of %3$s topic', 'Viewing %1$s - %2$s of %3$s topics', (int) $forum_template->total_topic_count, 'buddypress' ), $from_num, $to_num, $total, $pag_filter );
+        }
+
         /**
          * Filters the pagination count for the current topic list.
@@ -1889 +1895 @@
          * @param string $total    Total count of topics found.
          */
-        return apply_filters( 'bp_get_forum_pagination_count', sprintf( _n( 'Viewing 1 topic', 'Viewing %1$s - %2$s of %3$s topics', (int) $forum_template->total_topic_count, 'buddypress' ), $from_num, $to_num, $total, $pag_filter ), $from_num, $to_num, $total );
+        return apply_filters( 'bp_get_forum_pagination_count', $message, $from_num, $to_num, $total );
     }
 
@@ -2623 +2629 @@
     $total = bp_core_number_format( $topic_template->total_post_count );
 
+    if ( 1 == $topic_template->total_post_count ) {
+        $message = __( 'Viewing 1 post', 'buddypress' );
+    } else {
+        $message = sprintf( _n( 'Viewing %1$s - %2$s of %3$s post', 'Viewing %1$s - %2$s of %3$s posts', (int) $topic_template->total_post_count, 'buddypress' ), $from_num, $to_num, $total );
+    }
+
     /**
      * Filters the pagination count for the current topic page.
@@ -2633 +2645 @@
      * @param string $total    Total count of topics found.
      */
-    echo apply_filters( 'bp_the_topic_pagination_count', sprintf( _n( 'Viewing 1 post', 'Viewing %1$s - %2$s of %3$s posts', (int) $topic_template->total_post_count, 'buddypress' ), $from_num, $to_num, $total ), $from_num, $to_num, $total );
+    echo apply_filters( 'bp_the_topic_pagination_count', $message, $from_num, $to_num, $total );
 }