Changeset 10676 for trunk/src/bp-friends/classes/class-bp-friends-component.php

Timestamp:

03/23/2016 02:48:29 PM (9 years ago)

Author:

boonebgorges

Message:

Remove markup from translatable strings when building Friends nav items.

Props ramiy.
Fixes #6902.

File:

• trunk/src/bp-friends/classes/class-bp-friends-component.php (modified) (2 diffs)

trunk/src/bp-friends/classes/class-bp-friends-component.php

@@ -138 +138 @@
 
         // Add 'Friends' to the main navigation.
-        $count    = friends_get_total_friend_count();
-        $class    = ( 0 === $count ) ? 'no-count' : 'count';
+        $count = friends_get_total_friend_count();
+        $class = ( 0 === $count ) ? 'no-count' : 'count';
+
+        $main_nav_name = sprintf(
+            /* translators: %s: Friend count for the current user */
+            __( 'Friends %s', 'buddypress' ),
+            sprintf(
+                '<span class="%s">%s</span>',
+                esc_attr( $class ),
+                bp_core_number_format( $count )
+            )
+        );
+
         $main_nav = array(
-            'name'                => sprintf( __( 'Friends <span class="%s">%s</span>', 'buddypress' ), esc_attr( $class ), bp_core_number_format( $count ) ),
+            'name'                => $main_nav_name,
             'slug'                => $slug,
             'position'            => 60,
@@ -194 +205 @@
             $count = count( friends_get_friendship_request_user_ids( bp_loggedin_user_id() ) );
             if ( !empty( $count ) ) {
-                $title   = sprintf( _x( 'Friends <span class="count">%s</span>',          'My Account Friends menu',         'buddypress' ), bp_core_number_format( $count ) );
-                $pending = sprintf( _x( 'Pending Requests <span class="count">%s</span>', 'My Account Friends menu sub nav', 'buddypress' ), bp_core_number_format( $count ) );
+                $title = sprintf(
+                    /* translators: %s: Pending friend request count for the current user */
+                    _x( 'Friends %s', 'My Account Friends menu', 'buddypress' ),
+                    '<span class="count">' . bp_core_number_format( $count ) . '</span>'
+                );
+                $pending = sprintf(
+                    /* translators: %s: Pending friend request count for the current user */
+                    _x( 'Pending Requests %s', 'My Account Friends menu sub nav', 'buddypress' ),
+                    '<span class="count">' . bp_core_number_format( $count ) . '</span>'
+                );
             } else {
                 $title   = _x( 'Friends',            'My Account Friends menu',         'buddypress' );