Changeset 11576

Timestamp:

06/06/2017 05:46:09 PM (8 years ago)

Author:

dcavins

Message:

Improve message recipient list string handling.

WordPress 2.5 introduced wp_sprintf_l() which is built to concatenate
arrays into natural language lists (and is meant to be translation
friendly). This commit uses that function to build the recipient list
text for single messages, like “Conversation between Three, Four, Two,
and you.”

Props Offereins.

See #7096.

Location:

trunk/src

Files:

• bp-messages/bp-messages-template.php (modified) (2 diffs)
• bp-templates/bp-legacy/buddypress/members/single/messages/single.php (modified) (1 diff)

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

@@ -1635 +1635 @@
 
                 $recipient_links[] = $recipient_link;
+            } else {
+                $recipient_links[] = __( 'you', 'buddypress' );
             }
         }
 
+        // Concatenate to natural language string.
+        $recipient_links = wp_sprintf_l( '%l', $recipient_links );
+
         /**
          * Filters the HTML links to the profiles of recipients in the current thread.
@@ -1645 +1650 @@
          * @param string $value Comma-separated list of recipient HTML links for current thread.
          */
-        return apply_filters( 'bp_get_the_thread_recipients_list', implode( ', ', $recipient_links ) );
+        return apply_filters( 'bp_get_the_thread_recipients_list', $recipient_links );
     }
 

trunk/src/bp-templates/bp-legacy/buddypress/members/single/messages/single.php

@@ -36 +36 @@
                 <?php else : ?>
 
-                    <?php printf( __( 'Conversation between %s and you.', 'buddypress' ), bp_get_thread_recipients_list() ); ?>
+                    <?php printf( __( 'Conversation between %s.', 'buddypress' ), bp_get_thread_recipients_list() ); ?>
 
                 <?php endif; ?>