Changeset 12589

Timestamp:

03/28/2020 01:37:18 PM (4 years ago)

Author:

imath

Message:

BP Friends: add missing /* translators */ comments

See #8260

Location:

trunk/src/bp-friends

Files:

• bp-friends-activity.php (modified) (2 diffs)
• bp-friends-notifications.php (modified) (2 diffs)
• bp-friends-template.php (modified) (4 diffs)
• classes/class-bp-friends-component.php (modified) (1 diff)

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

@@ -142 +142 @@
     $friend_link    = bp_core_get_userlink( $activity->secondary_item_id );
 
+    /* translators: 1: the initiator user link. 2: the friend user link. */
     $action = sprintf( esc_html__( '%1$s and %2$s are now friends', 'buddypress' ), $initiator_link, $friend_link );
 
@@ -176 +177 @@
     $friend_link    = bp_core_get_userlink( $activity->secondary_item_id );
 
+    /* translators: 1: the initiator user link. 2: the friend user link. */
     $action = sprintf( esc_html__( '%1$s and %2$s are now friends', 'buddypress' ), $initiator_link, $friend_link );
 

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

@@ -39 +39 @@
             // Set up the string and the filter.
             if ( (int) $total_items > 1 ) {
+                /* translators: %d: the number of friends */
                 $text = sprintf( __( '%d friends accepted your friendship requests', 'buddypress' ), (int) $total_items );
                 $amount = 'multiple';
             } else {
+                /* translators: %s: friend name */
                 $text = sprintf( __( '%s accepted your friendship request', 'buddypress' ),  bp_core_get_user_displayname( $item_id ) );
                 $amount = 'single';
@@ -55 +57 @@
             // Set up the string and the filter.
             if ( (int) $total_items > 1 ) {
+                /* translators: %d: the number of pending requests */
                 $text = sprintf( __( 'You have %d pending friendship requests', 'buddypress' ), (int) $total_items );
                 $amount = 'multiple';
             } else {
+                /* translators: %s: friend name */
                 $text = sprintf( __( 'You have a friendship request from %s', 'buddypress' ),  bp_core_get_user_displayname( $item_id ) );
                 $amount = 'single';

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

@@ -82 +82 @@
 
     <div class="info-group">
-        <h4><?php bp_word_or_name( __( "My Friends", 'buddypress' ), __( "%s's Friends", 'buddypress' ) ) ?>  (<?php echo BP_Friends_Friendship::total_friend_count( bp_displayed_user_id() ) ?>) <span><a href="<?php echo trailingslashit( bp_displayed_user_domain() . bp_get_friends_slug() ) ?>"><?php _e('See All', 'buddypress') ?></a></span></h4>
+        <h4>
+            <?php
+            /* translators: %s: member name */
+            bp_word_or_name( __( "My Friends", 'buddypress' ), __( "%s's Friends", 'buddypress' ) );
+            ?>
+            &nbsp;
+            (<?php echo BP_Friends_Friendship::total_friend_count( bp_displayed_user_id() ); ?>)
+            &nbsp;
+            <span>
+                <a href="<?php echo trailingslashit( bp_displayed_user_domain() . bp_get_friends_slug() ) ?>">
+                    <?php esc_html_e( 'See All', 'buddypress' ) ?>
+                </a>
+            </span>
+        </h4>
 
         <?php if ( $friend_ids ) { ?>
@@ -102 +115 @@
 
             <div id="message" class="info">
-                <p><?php bp_word_or_name( __( "You haven't added any friend connections yet.", 'buddypress' ), __( "%s hasn't created any friend connections yet.", 'buddypress' ) ) ?></p>
+                <p>
+                    <?php
+                    /* translators: %s: member name */
+                    bp_word_or_name( __( "You haven't added any friend connections yet.", 'buddypress' ), __( "%s hasn't created any friend connections yet.", 'buddypress' ) );
+                    ?>
+                </p>
             </div>
 
@@ -235 +253 @@
         global $members_template;
 
-        if ( 1 == (int) $members_template->member->total_friend_count ) {
-
-            /**
-             * Filters text used to denote total friend count.
-             *
-             * @since 1.2.0
-             *
-             * @param string $value String of the form "x friends".
-             * @param int    $value Total friend count for current member in the loop.
-             */
-            return apply_filters( 'bp_get_member_total_friend_count', sprintf( __( '%d friend', 'buddypress' ), (int) $members_template->member->total_friend_count ) );
-        } else {
-
-            /** This filter is documented in bp-friends/bp-friends-template.php */
-            return apply_filters( 'bp_get_member_total_friend_count', sprintf( __( '%d friends', 'buddypress' ), (int) $members_template->member->total_friend_count ) );
-        }
+        $total_friend_count = (int) $members_template->member->total_friend_count;
+
+        /**
+         * Filters text used to denote total friend count.
+         *
+         * @since 1.2.0
+         *
+         * @param string $value String of the form "x friends".
+         * @param int    $value Total friend count for current member in the loop.
+         */
+        return apply_filters(
+            'bp_get_member_total_friend_count',
+            /* translators: %d: total friend count */
+            sprintf( _n( '%d friend', '%d friends', $total_friend_count, 'buddypress' ), number_format_i18n( $total_friend_count ) )
+        );
     }
 
@@ -717 +734 @@
 
             // If friends exist, show some formatted output.
-            $r['output'] = $r['before'] . sprintf( _n( '%s friend', '%s friends', $r['friends'], 'buddypress' ), '<strong>' . $r['friends'] . '</strong>' ) . $r['after'];
+            $r['output'] = $r['before'];
+
+            /* translators: %d: total friend count */
+            $r['output'] .= sprintf( _n( '%d friend', '%d friends', $r['friends'], 'buddypress' ), '<strong>' . number_format_i18n( $r['friends'] ) . '</strong>' );
+            $r['output'] .= $r['after'];
         }
     }

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

@@ -297 +297 @@
                     'item_id' => bp_displayed_user_id(),
                     'type'    => 'thumb',
-                    'alt'     => sprintf( __( 'Profile picture of %s', 'buddypress' ), bp_get_displayed_user_fullname() )
+                    'alt'     => sprintf(
+                        /* translators: %s: member name */
+                        __( 'Profile picture of %s', 'buddypress' ),
+                        bp_get_displayed_user_fullname()
+                    ),
                 ) );
                 $bp->bp_options_title = bp_get_displayed_user_fullname();