Changeset 9047

Timestamp:

09/27/2014 12:49:45 AM (11 years ago)

Author:

boonebgorges

Message:

Use _n() for translations in bp_get_group_member_count()

The previous technique (manually switching between 1 and not-1) does not
provide adequate internationalizability for all languages.

Adds unit tests.

Location:

trunk

Files:

• src/bp-groups/bp-groups-template.php (modified) (1 diff)
• tests/phpunit/testcases/groups/template.php (modified) (1 diff)

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

@@ -1634 +1634 @@
         global $groups_template;
 
-        if ( 1 == (int) $groups_template->group->total_member_count )
-            return apply_filters( 'bp_get_group_member_count', sprintf( __( '%s member', 'buddypress' ), bp_core_number_format( $groups_template->group->total_member_count ) ) );
-        else
-            return apply_filters( 'bp_get_group_member_count', sprintf( __( '%s members', 'buddypress' ), bp_core_number_format( $groups_template->group->total_member_count ) ) );
+        if ( isset( $groups_template->group->total_member_count ) ) {
+            $count = (int) $groups_template->group->total_member_count;
+        } else {
+            $count = 0;
+        }
+
+        $count_string = sprintf( _n( '%s member', '%s members', $count, 'buddypress' ), bp_core_number_format( $count ) );
+
+        return apply_filters( 'bp_get_group_member_count', $count_string );
     }
 

trunk/tests/phpunit/testcases/groups/template.php

@@ -797 +797 @@
         $this->set_current_user( $old_user );
     }
+
+    /**
+     * @group bp_get_group_member_count
+     */
+    public function test_bp_get_group_member_count_0_members() {
+        global $groups_template;
+        $gt = $groups_template;
+        $groups_template = new stdClass;
+        $groups_template->group = new stdClass;
+        $groups_template->group->total_member_count = 0;
+
+        $found = bp_get_group_member_count();
+
+        $groups_template = $gt;
+
+        $this->assertSame( '0 members', $found );
+    }
+
+    /**
+     * @group bp_get_group_member_count
+     */
+    public function test_bp_get_group_member_count_1_member() {
+        global $groups_template;
+        $gt = $groups_template;
+        $groups_template = new stdClass;
+        $groups_template->group = new stdClass;
+        $groups_template->group->total_member_count = 1;
+
+        $found = bp_get_group_member_count();
+
+        $groups_template = $gt;
+
+        $this->assertSame( '1 member', $found );
+    }
+
+    /**
+     * @group bp_get_group_member_count
+     */
+    public function test_bp_get_group_member_count_2_members() {
+        global $groups_template;
+        $gt = $groups_template;
+        $groups_template = new stdClass;
+        $groups_template->group = new stdClass;
+        $groups_template->group->total_member_count = 2;
+
+        $found = bp_get_group_member_count();
+
+        $groups_template = $gt;
+
+        $this->assertSame( '2 members', $found );
+    }
 }