Changeset 12590
- Timestamp:
- 03/28/2020 01:39:38 PM (5 years ago)
- Location:
- trunk/src/bp-groups
- Files:
-
- 14 edited
-
actions/feed.php (modified) (1 diff)
-
bp-groups-activity.php (modified) (4 diffs)
-
bp-groups-admin.php (modified) (6 diffs)
-
bp-groups-adminbar.php (modified) (1 diff)
-
bp-groups-functions.php (modified) (3 diffs)
-
bp-groups-notifications.php (modified) (15 diffs)
-
bp-groups-template.php (modified) (16 diffs)
-
bp-groups-widgets.php (modified) (1 diff)
-
classes/class-bp-groups-component.php (modified) (2 diffs)
-
classes/class-bp-groups-group-members-template.php (modified) (1 diff)
-
classes/class-bp-groups-invite-template.php (modified) (2 diffs)
-
classes/class-bp-groups-membership-requests-template.php (modified) (1 diff)
-
classes/class-bp-groups-widget.php (modified) (1 diff)
-
screens/user/invites.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/bp-groups/actions/feed.php
r11923 r12590 33 33 'id' => 'group', 34 34 35 /* translators: Group activity RSS title - "[Site Name] | [Group Name] | Activity"*/36 'title' => sprintf( _ _( '%1$s | %2$s | Activity', 'buddypress' ), bp_get_site_name(), bp_get_current_group_name() ),35 /* translators: 1: Site Name. 2:Group Name. */ 36 'title' => sprintf( _x( '%1$s | %2$s | Activity', 'Group activity RSS title', 'buddypress' ), bp_get_site_name(), bp_get_current_group_name() ), 37 37 38 38 'link' => bp_get_group_permalink( $group ), 39 40 /* translators: %s: Group Name. */ 39 41 'description' => sprintf( __( "Activity feed for the group, %s.", 'buddypress' ), bp_get_current_group_name() ), 42 40 43 'activity_args' => array( 41 44 'object' => buddypress()->groups->id, -
trunk/src/bp-groups/bp-groups-activity.php
r12395 r12590 109 109 $group_link = '<a href="' . esc_url( bp_get_group_permalink( $group ) ) . '">' . esc_html( $group->name ) . '</a>'; 110 110 111 /* translators: 1: the user link. 2: the group link. */ 111 112 $action = sprintf( esc_html__( '%1$s created the group %2$s', 'buddypress'), $user_link, $group_link ); 112 113 … … 137 138 $group_link = '<a href="' . esc_url( bp_get_group_permalink( $group ) ) . '">' . esc_html( $group->name ) . '</a>'; 138 139 140 /* translators: 1: the user link. 2: the group link. */ 139 141 $action = sprintf( esc_html__( '%1$s joined the group %2$s', 'buddypress' ), $user_link, $group_link ); 140 142 … … 184 186 // No changed details were found, so use a generic message. 185 187 if ( empty( $changed ) ) { 188 /* translators: 1: the user link. 2: the group link. */ 186 189 $action = sprintf( esc_html__( '%1$s updated details for the group %2$s', 'buddypress' ), $user_link, $group_link ); 187 190 188 191 // Name and description changed - to keep things short, don't describe changes in detail. 189 192 } elseif ( isset( $changed['name'] ) && isset( $changed['description'] ) ) { 193 /* translators: 1: the user link. 2: the group link. */ 190 194 $action = sprintf( esc_html__( '%1$s changed the name and description of the group %2$s', 'buddypress' ), $user_link, $group_link ); 191 195 192 196 // Name only. 193 197 } elseif ( ! empty( $changed['name']['old'] ) && ! empty( $changed['name']['new'] ) ) { 198 /* translators: 1: the user link. 2: the group link. 3: the old group name. 4: the new group name. */ 194 199 $action = sprintf( esc_html__( '%1$s changed the name of the group %2$s from "%3$s" to "%4$s"', 'buddypress' ), $user_link, $group_link, esc_html( $changed['name']['old'] ), esc_html( $changed['name']['new'] ) ); 195 200 196 201 // Description only. 197 202 } elseif ( ! empty( $changed['description']['old'] ) && ! empty( $changed['description']['new'] ) ) { 203 /* translators: 1: the user link. 2: the group link. 3: the old group description. 4: the new group description. */ 198 204 $action = sprintf( esc_html__( '%1$s changed the description of the group %2$s from "%3$s" to "%4$s"', 'buddypress' ), $user_link, $group_link, esc_html( $changed['description']['old'] ), esc_html( $changed['description']['new'] ) ); 199 205 200 206 } elseif ( ! empty( $changed['slug']['old'] ) && ! empty( $changed['slug']['new'] ) ) { 207 /* translators: 1: the user link. 2: the group link. */ 201 208 $action = sprintf( esc_html__( '%1$s changed the permalink of the group %2$s.', 'buddypress' ), $user_link, $group_link ); 202 203 209 } 204 210 … … 230 236 231 237 // Set the Activity update posted in a Group action. 232 $action = sprintf( esc_html__( '%1$s posted an update in the group %2$s', 'buddypress' ), $user_link, $group_link ); 238 $action = sprintf( 239 /* translators: 1: the user link. 2: the group link. */ 240 esc_html__( '%1$s posted an update in the group %2$s', 'buddypress' ), 241 $user_link, 242 $group_link 243 ); 233 244 234 245 /** This filter is documented in wp-includes/deprecated.php */ -
trunk/src/bp-groups/bp-groups-admin.php
r12405 r12590 538 538 539 539 if ( ! empty( $error_new ) ) { 540 /* translators: %s: comma separated list of usernames */ 540 541 $messages[] = sprintf( __( 'The following users could not be added to the group: %s', 'buddypress' ), '<em>' . esc_html( implode( ', ', $error_new ) ) . '</em>' ); 541 542 } 542 543 543 544 if ( ! empty( $success_new ) ) { 545 /* translators: %s: comma separated list of usernames */ 544 546 $messages[] = sprintf( __( 'The following users were successfully added to the group: %s', 'buddypress' ), '<em>' . esc_html( implode( ', ', $success_new ) ) . '</em>' ); 545 547 } … … 547 549 if ( ! empty( $error_modified ) ) { 548 550 $error_modified = bp_groups_admin_get_usernames_from_ids( $error_modified ); 551 /* translators: %s: comma separated list of usernames */ 549 552 $messages[] = sprintf( __( 'An error occurred when trying to modify the following members: %s', 'buddypress' ), '<em>' . esc_html( implode( ', ', $error_modified ) ) . '</em>' ); 550 553 } … … 552 555 if ( ! empty( $success_modified ) ) { 553 556 $success_modified = bp_groups_admin_get_usernames_from_ids( $success_modified ); 557 /* translators: %s: comma separated list of usernames */ 554 558 $messages[] = sprintf( __( 'The following members were successfully modified: %s', 'buddypress' ), '<em>' . esc_html( implode( ', ', $success_modified ) ) . '</em>' ); 555 559 } … … 559 563 560 564 // Get the group from the database. 561 $group 565 $group = groups_get_group( (int) $_GET['gid'] ); 562 566 563 567 $group_name = isset( $group->name ) ? bp_get_group_name( $group ) : ''; … … 746 750 747 751 if ( $deleted > 0 ) { 752 /* translators: %s: number of deleted groups */ 748 753 $messages[] = sprintf( _n( '%s group has been permanently deleted.', '%s groups have been permanently deleted.', $deleted, 'buddypress' ), number_format_i18n( $deleted ) ); 749 754 } … … 1230 1235 } else { 1231 1236 $viewing_text = sprintf( 1237 /* translators: 1: group member from number. 2: group member to number. 3: total group members. */ 1232 1238 _nx( 'Viewing %1$s - %2$s of %3$s member', 'Viewing %1$s - %2$s of %3$s members', $query->total_users, 'Group members pagination in group admin', 'buddypress' ), 1233 1239 bp_core_number_format( $current_page_start ), -
trunk/src/bp-groups/bp-groups-adminbar.php
r12495 r12590 65 65 */ 66 66 if ( $menu->show_in_admin_bar ) { 67 /* translators: %s the group menu name */ 67 68 $title = sprintf( _x( 'Edit Group %s', 'Group WP Admin Bar manage links', 'buddypress' ), $menu->name ); 68 69 69 70 // Title is specific for delete. 70 71 if ( 'delete-group' == $menu->slug ) { 72 /* translators: %s the group menu name */ 71 73 $title = sprintf( _x( '%s Group', 'Group WP Admin Bar delete link', 'buddypress' ), $menu->name ); 72 74 } -
trunk/src/bp-groups/bp-groups-functions.php
r12540 r12590 695 695 // Backward compatibility with old method of passing arguments. 696 696 if ( ! is_array( $args ) || count( $function_args ) > 1 ) { 697 /* translators: 1: the name of the method. 2: the name of the file. */ 697 698 _deprecated_argument( __METHOD__, '2.0.0', sprintf( __( 'Arguments passed to %1$s should be in an associative array. See the inline documentation at %2$s for more details.', 'buddypress' ), __METHOD__, __FILE__ ) ); 698 699 … … 2079 2080 2080 2081 if ( ! empty( $membership_id ) ) { 2081 _deprecated_argument( __METHOD__, '5.0.0', sprintf( __( 'Argument `membership_id` passed to %1$s is deprecated. See the inline documentation at %2$s for more details.', 'buddypress' ), __METHOD__, __FILE__ ) ); 2082 /* translators: 1: the name of the method. 2: the name of the file. */ 2083 _deprecated_argument( __METHOD__, '5.0.0', sprintf( __( 'Argument `membership_id` passed to %1$s is deprecated. See the inline documentation at %2$s for more details.', 'buddypress' ), __METHOD__, __FILE__ ) ); 2082 2084 } 2083 2085 … … 2149 2151 function groups_delete_membership_request( $membership_id, $user_id = 0, $group_id = 0 ) { 2150 2152 if ( ! empty( $membership_id ) ){ 2153 /* translators: 1: method name. 2: file name. */ 2151 2154 _deprecated_argument( __METHOD__, '5.0.0', sprintf( __( 'Argument `membership_id` passed to %1$s is deprecated. See the inline documentation at %2$s for more details.', 'buddypress' ), __METHOD__, __FILE__ ) ); 2152 2155 } -
trunk/src/bp-groups/bp-groups-notifications.php
r12437 r12590 32 32 if ( $group->name !== $old_group->name ) { 33 33 $changed[] = sprintf( 34 _x( '* Name changed from "%s" to "%s".', 'Group update email text', 'buddypress' ), 34 /* translators: 1: the old group name. 2: the new group name. */ 35 _x( '* Name changed from "%1$s" to "%2$s".', 'Group update email text', 'buddypress' ), 35 36 esc_html( $old_group->name ), 36 37 esc_html( $group->name ) … … 40 41 if ( $group->description !== $old_group->description ) { 41 42 $changed[] = sprintf( 42 _x( '* Description changed from "%s" to "%s".', 'Group update email text', 'buddypress' ), 43 /* translators: 1: the old group description. 2: the new group description. */ 44 _x( '* Description changed from "%1$s" to "%2$s".', 'Group update email text', 'buddypress' ), 43 45 esc_html( $old_group->description ), 44 46 esc_html( $group->description ) … … 48 50 if ( $group->slug !== $old_group->slug ) { 49 51 $changed[] = sprintf( 50 _x( '* Permalink changed from "%s" to "%s".', 'Group update email text', 'buddypress' ), 52 /* translators: 1: the old group permalink. 2: the new group permalink. */ 53 _x( '* Permalink changed from "%1$s" to "%2$s".', 'Group update email text', 'buddypress' ), 51 54 esc_url( bp_get_group_permalink( $old_group ) ), 52 55 esc_url( bp_get_group_permalink( $group ) ) … … 394 397 // we'll return values inline. 395 398 if ( (int) $total_items > 1 ) { 399 /* translators: 1: number of group membership requests. 2: group name. */ 396 400 $text = sprintf( __( '%1$d new membership requests for the group "%2$s"', 'buddypress' ), (int) $total_items, $group->name ); 397 401 $amount = 'multiple'; … … 440 444 } else { 441 445 $user_fullname = bp_core_get_user_displayname( $requesting_user_id ); 446 /* translators: %s: member name */ 442 447 $text = sprintf( __( '%s requests group membership', 'buddypress' ), $user_fullname ); 443 448 $notification_link = $group_link . 'admin/membership-requests/?n=1'; … … 495 500 496 501 if ( (int) $total_items > 1 ) { 497 $text = sprintf( __( '%d accepted group membership requests', 'buddypress' ), (int) $total_items, $group->name ); 502 /* translators: 1: number of accepted group membership requests. 2: group name. */ 503 $text = sprintf( __( '%1$d accepted group membership requests for the group "%2$s"', 'buddypress' ), (int) $total_items, $group->name ); 498 504 $amount = 'multiple'; 499 505 $notification_link = trailingslashit( bp_loggedin_user_domain() . bp_get_groups_slug() ) . '?n=1'; … … 534 540 } 535 541 } else { 542 /* translators: %s: group name. */ 536 543 $text = sprintf( __( 'Membership for group "%s" accepted', 'buddypress' ), $group->name ); 537 544 $filter = 'bp_groups_single_membership_request_accepted_notification'; … … 584 591 585 592 if ( (int) $total_items > 1 ) { 586 $text = sprintf( __( '%d rejected group membership requests', 'buddypress' ), (int) $total_items, $group->name ); 593 /* translators: 1: number of accepted group membership requests. 2: group name. */ 594 $text = sprintf( __( '%1$d rejected group membership requests for the group "%2$s"', 'buddypress' ), (int) $total_items, $group->name ); 587 595 $amount = 'multiple'; 588 596 $notification_link = trailingslashit( bp_loggedin_user_domain() . bp_get_groups_slug() ) . '?n=1'; … … 623 631 } 624 632 } else { 633 /* translators: %s: group name. */ 625 634 $text = sprintf( __( 'Membership for group "%s" rejected', 'buddypress' ), $group->name ); 626 635 $notification_link = $group_link . '?n=1'; … … 672 681 673 682 if ( (int) $total_items > 1 ) { 683 /* translators: %d: number of groups the user has been promoted admin for */ 674 684 $text = sprintf( __( 'You were promoted to an admin in %d groups', 'buddypress' ), (int) $total_items ); 675 685 $amount = 'multiple'; … … 707 717 } 708 718 } else { 719 /* translators: %s: group name. */ 709 720 $text = sprintf( __( 'You were promoted to an admin in the group "%s"', 'buddypress' ), $group->name ); 710 721 $notification_link = $group_link . '?n=1'; … … 754 765 755 766 if ( (int) $total_items > 1 ) { 767 /* translators: %d: number of groups the user has been promoted mod for */ 756 768 $text = sprintf( __( 'You were promoted to a mod in %d groups', 'buddypress' ), (int) $total_items ); 757 769 $amount = 'multiple'; … … 789 801 } 790 802 } else { 803 /* translators: %s: group name. */ 791 804 $text = sprintf( __( 'You were promoted to a mod in the group "%s"', 'buddypress' ), $group->name ); 792 805 $notification_link = $group_link . '?n=1'; … … 837 850 838 851 if ( (int) $total_items > 1 ) { 852 /* translators: %d: number of group invites */ 839 853 $text = sprintf( __( 'You have %d new group invitations', 'buddypress' ), (int) $total_items ); 840 854 $amount = 'multiple'; … … 871 885 } 872 886 } else { 887 /* translators: %s: group name. */ 873 888 $text = sprintf( __( 'You have an invitation to the group: %s', 'buddypress' ), $group->name ); 874 889 $filter = 'bp_groups_single_group_invite_notification'; -
trunk/src/bp-groups/bp-groups-template.php
r12568 r12590 1546 1546 'class' => 'avatar', 1547 1547 'id' => false, 1548 'alt' => sprintf( __( 'Group creator profile photo of %s', 'buddypress' ), bp_core_get_user_displayname( $group->creator_id ) ) 1548 'alt' => sprintf( 1549 /* translators: %s: group creator name */ 1550 __( 'Group creator profile photo of %s', 'buddypress' ), 1551 bp_core_get_user_displayname( $group->creator_id ) 1552 ), 1549 1553 ), 'group_creator_avatar' ); 1550 1554 extract( $r, EXTR_SKIP ); … … 1609 1613 <?php foreach( (array) $group->admins as $admin ) { ?> 1610 1614 <li> 1611 <a href="<?php echo bp_core_get_user_domain( $admin->user_id, $admin->user_nicename, $admin->user_login ) ?>" class="bp-tooltip" data-bp-tooltip="<?php printf( ('%s'), bp_core_get_user_displayname( $admin->user_id ) ); ?>"><?php echo bp_core_fetch_avatar( array( 'item_id' => $admin->user_id, 'email' => $admin->user_email, 'alt' => sprintf( __( 'Profile picture of %s', 'buddypress' ), bp_core_get_user_displayname( $admin->user_id ) ) ) ) ?></a> 1615 <a href="<?php echo bp_core_get_user_domain( $admin->user_id, $admin->user_nicename, $admin->user_login ) ?>" class="bp-tooltip" data-bp-tooltip="<?php printf( ('%s'), bp_core_get_user_displayname( $admin->user_id ) ); ?>"> 1616 <?php 1617 echo bp_core_fetch_avatar( 1618 array( 1619 'item_id' => $admin->user_id, 1620 'email' => $admin->user_email, 1621 'alt' => sprintf( 1622 /* translators: %s: member name */ 1623 __( 'Profile picture of %s', 'buddypress' ), 1624 bp_core_get_user_displayname( $admin->user_id ) 1625 ), 1626 ) 1627 ); 1628 ?> 1629 </a> 1612 1630 </li> 1613 1631 <?php } ?> … … 1641 1659 1642 1660 <li> 1643 <a href="<?php echo bp_core_get_user_domain( $mod->user_id, $mod->user_nicename, $mod->user_login ) ?>" class="bp-tooltip" data-bp-tooltip="<?php printf( ('%s'), bp_core_get_user_displayname( $mod->user_id ) ); ?>"><?php echo bp_core_fetch_avatar( array( 'item_id' => $mod->user_id, 'email' => $mod->user_email, 'alt' => sprintf( __( 'Profile picture of %s', 'buddypress' ), bp_core_get_user_displayname( $mod->user_id ) ) ) ) ?></a> 1661 <a href="<?php echo bp_core_get_user_domain( $mod->user_id, $mod->user_nicename, $mod->user_login ) ?>" class="bp-tooltip" data-bp-tooltip="<?php printf( ('%s'), bp_core_get_user_displayname( $mod->user_id ) ); ?>"> 1662 <?php 1663 echo bp_core_fetch_avatar( 1664 array( 1665 'item_id' => $mod->user_id, 1666 'email' => $mod->user_email, 1667 'alt' => sprintf( 1668 /* translators: %s: member name */ 1669 __( 'Profile picture of %s', 'buddypress' ), 1670 bp_core_get_user_displayname( $mod->user_id ) 1671 ), 1672 ) 1673 ); ?> 1674 </a> 1644 1675 </li> 1645 1676 … … 1892 1923 $message = __( 'Viewing 1 group', 'buddypress' ); 1893 1924 } else { 1925 /* translators: 1: group from number. 2: group to number. 3: total groups. */ 1894 1926 $message = sprintf( _n( 'Viewing %1$s - %2$s of %3$s group', 'Viewing %1$s - %2$s of %3$s groups', $groups_template->total_group_count, 'buddypress' ), $from_num, $to_num, $total ); 1895 1927 } … … 2251 2283 <li> 2252 2284 2253 <?php echo bp_core_fetch_avatar( array( 'item_id' => $admin->user_id, 'type' => 'thumb', 'width' => 30, 'height' => 30, 'alt' => sprintf( __( 'Profile picture of %s', 'buddypress' ), bp_core_get_user_displayname( $admin->user_id ) ) ) ) ?> 2285 <?php 2286 echo bp_core_fetch_avatar( 2287 array( 2288 'item_id' => $admin->user_id, 2289 'type' => 'thumb', 2290 'width' => 30, 2291 'height' => 30, 2292 'alt' => sprintf( 2293 /* translators: %s: member name */ 2294 __( 'Profile picture of %s', 'buddypress' ), 2295 bp_core_get_user_displayname( $admin->user_id ) 2296 ), 2297 ) 2298 ); 2299 ?> 2254 2300 2255 2301 <h5> … … 2267 2313 <li> 2268 2314 2269 <?php echo bp_core_fetch_avatar( array( 'item_id' => $admin->user_id, 'type' => 'thumb', 'alt' => sprintf( __( 'Profile picture of %s', 'buddypress' ), bp_core_get_user_displayname( $admin->user_id ) ) ) ) ?> 2315 <?php 2316 echo bp_core_fetch_avatar( 2317 array( 2318 'item_id' => $admin->user_id, 2319 'type' => 'thumb', 2320 'alt' => sprintf( 2321 /* translators: %s: member name */ 2322 __( 'Profile picture of %s', 'buddypress' ), 2323 bp_core_get_user_displayname( $admin->user_id ) 2324 ), 2325 ) 2326 ); 2327 ?> 2270 2328 2271 2329 <h5><?php echo bp_core_get_userlink( $admin->user_id ) ?></h5> 2272 2330 <span class="activity"> 2273 <?php echo bp_core_get_last_activity( strtotime( $admin->date_modified ), __( 'joined %s', 'buddypress') ); ?> 2331 <?php 2332 /* translators: %s: human time diff */ 2333 echo bp_core_get_last_activity( strtotime( $admin->date_modified ), __( 'joined %s', 'buddypress') ); 2334 ?> 2274 2335 </span> 2275 2336 … … 2327 2388 <li> 2328 2389 2329 <?php echo bp_core_fetch_avatar( array( 'item_id' => $mod->user_id, 'type' => 'thumb', 'width' => 30, 'height' => 30, 'alt' => sprintf( __( 'Profile picture of %s', 'buddypress' ), bp_core_get_user_displayname( $mod->user_id ) ) ) ) ?> 2390 <?php 2391 /* translators: %s: member name */ 2392 echo bp_core_fetch_avatar( 2393 array( 2394 'item_id' => $mod->user_id, 2395 'type' => 'thumb', 2396 'width' => 30, 2397 'height' => 30, 2398 'alt' => sprintf( 2399 /* translators: %s: member name */ 2400 __( 'Profile picture of %s', 'buddypress' ), 2401 bp_core_get_user_displayname( $mod->user_id ) 2402 ), 2403 ) 2404 ); 2405 ?> 2330 2406 2331 2407 <h5> … … 2343 2419 <li> 2344 2420 2345 <?php echo bp_core_fetch_avatar( array( 'item_id' => $mod->user_id, 'type' => 'thumb', 'alt' => sprintf( __( 'Profile picture of %s', 'buddypress' ), bp_core_get_user_displayname( $mod->user_id ) ) ) ) ?> 2421 <?php 2422 echo bp_core_fetch_avatar( 2423 array( 2424 'item_id' => $mod->user_id, 2425 'type' => 'thumb', 2426 'alt' => sprintf( 2427 /* translators: %s: member name */ 2428 __( 'Profile picture of %s', 'buddypress' ), 2429 bp_core_get_user_displayname( $mod->user_id ) 2430 ), 2431 ) 2432 ); 2433 ?> 2346 2434 2347 2435 <h5><?php echo bp_core_get_userlink( $mod->user_id ) ?></h5> 2348 2436 2349 <span class="activity"><?php echo bp_core_get_last_activity( strtotime( $mod->date_modified ), __( 'joined %s', 'buddypress') ); ?></span> 2437 <span class="activity"> 2438 <?php 2439 /* translators: %s: human time diff */ 2440 echo bp_core_get_last_activity( strtotime( $mod->date_modified ), __( 'joined %s', 'buddypress') ); 2441 ?> 2442 </span> 2350 2443 2351 2444 <?php if ( bp_is_active( 'friends' ) ) : ?> … … 4051 4144 * @param string $value Joined since time. 4052 4145 */ 4053 return apply_filters( 'bp_get_group_member_joined_since', bp_core_get_last_activity( $members_template->member->date_modified, __( 'joined %s', 'buddypress') ) ); 4146 return apply_filters( 4147 'bp_get_group_member_joined_since', 4148 bp_core_get_last_activity( 4149 $members_template->member->date_modified, 4150 /* translators: %s: human time diff */ 4151 __( 'joined %s', 'buddypress') 4152 ) 4153 ); 4054 4154 } 4055 4155 … … 4167 4267 $message = __( 'Viewing 1 member', 'buddypress' ); 4168 4268 } else { 4169 $message = sprintf( _n( 'Viewing %1$s - %2$s of %3$s member', 'Viewing %1$s - %2$s of %3$s members', $members_template->total_member_count, 'buddypress' ), $from_num, $to_num, $total ); 4269 /* translators: 1: group member from number. 2: group member to number. 3: total group members. */ 4270 $message = sprintf( _nx( 'Viewing %1$s - %2$s of %3$s member', 'Viewing %1$s - %2$s of %3$s members', $members_template->total_member_count, 'group members pagination', 'buddypress' ), $from_num, $to_num, $total ); 4170 4271 } 4171 4272 … … 5138 5239 $type_object = bp_groups_get_group_type_object( bp_get_current_group_directory_type() ); 5139 5240 5241 /* translators: %s: group type singular name */ 5140 5242 $message = sprintf( __( 'Viewing groups of the type: %s', 'buddypress' ), '<strong>' . $type_object->labels['singular_name'] . '</strong>' ); 5141 5243 … … 5495 5597 * @param string $value Formatted time since membership was requested. 5496 5598 */ 5497 echo apply_filters( 'bp_group_request_time_since_requested', sprintf( __( 'requested %s', 'buddypress' ), bp_core_time_since( $requests_template->request->date_modified ) ) ); 5599 echo apply_filters( 5600 'bp_group_request_time_since_requested', 5601 /* translators: %s: human time diff */ 5602 sprintf( __( 'requested %s', 'buddypress' ), bp_core_time_since( $requests_template->request->date_modified ) ) 5603 ); 5498 5604 } 5499 5605 … … 5568 5674 $message = __( 'Viewing 1 request', 'buddypress' ); 5569 5675 } else { 5676 /* translators: 1: group request from number. 2: group request to number. 3: total group requests. */ 5570 5677 $message = sprintf( _n( 'Viewing %1$s - %2$s of %3$s request', 'Viewing %1$s - %2$s of %3$s requests', $requests_template->total_request_count, 'buddypress' ), $from_num, $to_num, $total ); 5571 5678 } … … 5837 5944 $message = __( 'Viewing 1 invitation', 'buddypress' ); 5838 5945 } else { 5946 /* translators: 1: group invite from number. 2: group invite to number. 3: total group invites. */ 5839 5947 $message = sprintf( _n( 'Viewing %1$s - %2$s of %3$s invitation', 'Viewing %1$s - %2$s of %3$s invitations', $invites_template->total_invite_count, 'buddypress' ), $from_num, $to_num, $total ); 5840 5948 } … … 6015 6123 * @param string $current_group_desc Description of the current group. 6016 6124 */ 6017 $desc 6125 $desc = apply_filters( 'bp_get_group_description', $current_group_desc ); 6018 6126 6019 6127 /** … … 6140 6248 6141 6249 // If groups exist, show some formatted output 6142 $r['output'] = $r['before'] . sprintf( _n( '%s group', '%s groups', $r['groups'], 'buddypress' ), '<strong>' . $r['groups'] . '</strong>' ) . $r['after']; 6250 $r['output'] = $r['before']; 6251 6252 /* translators: %s: number of groups */ 6253 $r['output'] .= sprintf( _n( '%s group', '%s groups', $r['groups'], 'buddypress' ), '<strong>' . $r['groups'] . '</strong>' ); 6254 $r['output'] .= $r['after']; 6143 6255 } 6144 6256 } -
trunk/src/bp-groups/bp-groups-widgets.php
r11528 r12590 66 66 <div class="item-meta"> 67 67 <?php if ( 'newest-groups' === $_POST['filter'] ) : ?> 68 <span class="activity" data-livestamp="<?php bp_core_iso8601_date( bp_get_group_date_created( 0, array( 'relative' => false ) ) ); ?>"><?php printf( __( 'created %s', 'buddypress' ), bp_get_group_date_created() ); ?></span> 68 <span class="activity" data-livestamp="<?php bp_core_iso8601_date( bp_get_group_date_created( 0, array( 'relative' => false ) ) ); ?>"> 69 <?php 70 /* translators: %s: date */ 71 printf( __( 'created %s', 'buddypress' ), bp_get_group_date_created() ); 72 ?> 73 </span> 69 74 <?php elseif ( 'popular-groups' === $_POST['filter'] ) : ?> 70 75 <span class="activity"><?php bp_group_member_count(); ?></span> 71 76 <?php else : ?> 72 <span class="activity" data-livestamp="<?php bp_core_iso8601_date( bp_get_group_last_active( 0, array( 'relative' => false ) ) ); ?>"><?php printf( __( 'active %s', 'buddypress' ), bp_get_group_last_active() ); ?></span> 77 <span class="activity" data-livestamp="<?php bp_core_iso8601_date( bp_get_group_last_active( 0, array( 'relative' => false ) ) ); ?>"> 78 <?php 79 /* translators: %s: last activity timestamp (e.g. "active 1 hour ago") */ 80 printf( _x( 'active %s', 'last time the group was active', 'buddypress' ), bp_get_group_last_active() ); 81 ?> 82 </span> 73 83 <?php endif; ?> 74 84 </div> -
trunk/src/bp-groups/classes/class-bp-groups-component.php
r12580 r12590 651 651 */ 652 652 $sub_nav[] = array( 653 'name' => sprintf( _x( 'Members %s', 'My Group screen nav', 'buddypress' ), '<span>' . number_format( $this->current_group->total_member_count ) . '</span>' ), 653 'name' => sprintf( 654 /* translators: %s: total member count */ 655 _x( 'Members %s', 'My Group screen nav', 'buddypress' ), 656 '<span>' . number_format( $this->current_group->total_member_count ) . '</span>' 657 ), 654 658 'slug' => 'members', 655 659 'parent_url' => $group_link, … … 868 872 'item_id' => bp_displayed_user_id(), 869 873 'type' => 'thumb', 870 'alt' => sprintf( __( 'Profile picture of %s', 'buddypress' ), bp_get_displayed_user_fullname() ) 874 'alt' => sprintf( 875 /* translators: %s: member name */ 876 __( 'Profile picture of %s', 'buddypress' ), 877 bp_get_displayed_user_fullname() 878 ), 871 879 ) ); 872 880 $bp->bp_options_title = bp_get_displayed_user_fullname(); -
trunk/src/bp-groups/classes/class-bp-groups-group-members-template.php
r12426 r12590 98 98 // Backward compatibility with old method of passing arguments. 99 99 if ( ! is_array( $args ) || count( $function_args ) > 1 ) { 100 /* translators: 1: the name of the method. 2: the name of the file. */ 100 101 _deprecated_argument( __METHOD__, '2.0.0', sprintf( __( 'Arguments passed to %1$s should be in an associative array. See the inline documentation at %2$s for more details.', 'buddypress' ), __METHOD__, __FILE__ ) ); 101 102 -
trunk/src/bp-groups/classes/class-bp-groups-invite-template.php
r12426 r12590 83 83 // Backward compatibility with old method of passing arguments. 84 84 if ( ! is_array( $args ) || count( $function_args ) > 1 ) { 85 /* translators: 1: the name of the method. 2: the name of the file. */ 85 86 _deprecated_argument( __METHOD__, '2.0.0', sprintf( __( 'Arguments passed to %1$s should be in an associative array. See the inline documentation at %2$s for more details.', 'buddypress' ), __METHOD__, __FILE__ ) ); 86 87 … … 233 234 } 234 235 235 $this->invite->user->avatar = bp_core_fetch_avatar( array( 'item_id' => $user_id, 'type' => 'full', 'alt' => sprintf( __( 'Profile photo of %s', 'buddypress' ), $this->invite->user->fullname ) ) ); 236 $this->invite->user->avatar_thumb = bp_core_fetch_avatar( array( 'item_id' => $user_id, 'type' => 'thumb', 'alt' => sprintf( __( 'Profile photo of %s', 'buddypress' ), $this->invite->user->fullname ) ) ); 237 $this->invite->user->avatar_mini = bp_core_fetch_avatar( array( 'item_id' => $user_id, 'type' => 'thumb', 'alt' => sprintf( __( 'Profile photo of %s', 'buddypress' ), $this->invite->user->fullname ), 'width' => 30, 'height' => 30 ) ); 238 $this->invite->user->email = $this->invite->user->user_email; 239 $this->invite->user->user_url = bp_core_get_user_domain( $user_id, $this->invite->user->user_nicename, $this->invite->user->user_login ); 240 $this->invite->user->user_link = "<a href='{$this->invite->user->user_url}'>{$this->invite->user->fullname}</a>"; 241 $this->invite->user->last_active = bp_core_get_last_activity( $this->invite->user->last_activity, __( 'active %s', 'buddypress' ) ); 236 $this->invite->user->avatar = bp_core_fetch_avatar( 237 array( 238 'item_id' => $user_id, 239 'type' => 'full', 240 'alt' => sprintf( 241 /* translators: %s: member name */ 242 __( 'Profile photo of %s', 'buddypress' ), 243 $this->invite->user->fullname 244 ) 245 ) 246 ); 247 248 $this->invite->user->avatar_thumb = bp_core_fetch_avatar( 249 array( 250 'item_id' => $user_id, 251 'type' => 'thumb', 252 'alt' => sprintf( 253 /* translators: %s: member name */ 254 __( 'Profile photo of %s', 'buddypress' ), 255 $this->invite->user->fullname 256 ) 257 ) 258 ); 259 260 $this->invite->user->avatar_mini = bp_core_fetch_avatar( 261 array( 262 'item_id' => $user_id, 263 'type' => 'thumb', 264 'alt' => sprintf( 265 /* translators: %s: member name */ 266 __( 'Profile photo of %s', 'buddypress' ), 267 $this->invite->user->fullname 268 ), 269 'width' => 30, 270 'height' => 30 271 ) 272 ); 273 274 $this->invite->user->email = $this->invite->user->user_email; 275 $this->invite->user->user_url = bp_core_get_user_domain( $user_id, $this->invite->user->user_nicename, $this->invite->user->user_login ); 276 $this->invite->user->user_link = "<a href='{$this->invite->user->user_url}'>{$this->invite->user->fullname}</a>"; 277 278 /* translators: %s: last activity timestamp (e.g. "active 1 hour ago") */ 279 $this->invite->user->last_active = bp_core_get_last_activity( $this->invite->user->last_activity, __( 'active %s', 'buddypress' ) ); 242 280 243 281 if ( bp_is_active( 'groups' ) ) { -
trunk/src/bp-groups/classes/class-bp-groups-membership-requests-template.php
r12426 r12590 90 90 // Backward compatibility with old method of passing arguments. 91 91 if ( ! is_array( $args ) || count( $function_args ) > 1 ) { 92 /* translators: 1: the name of the method. 2: the name of the file. */ 92 93 _deprecated_argument( __METHOD__, '2.0.0', sprintf( __( 'Arguments passed to %1$s should be in an associative array. See the inline documentation at %2$s for more details.', 'buddypress' ), __METHOD__, __FILE__ ) ); 93 94 -
trunk/src/bp-groups/classes/class-bp-groups-widget.php
r12324 r12590 150 150 bp_group_member_count(); 151 151 } else { 152 /* translators: %s: last activity timestamp (e.g. "active 1 hour ago") */ 152 153 printf( __( 'active %s', 'buddypress' ), bp_get_group_last_active() ); 153 154 } -
trunk/src/bp-groups/screens/user/invites.php
r12126 r12590 18 18 if ( bp_is_action_variable( 'accept' ) && is_numeric( $group_id ) ) { 19 19 // Check the nonce. 20 if ( ! check_admin_referer( 'groups_accept_invite' ) )20 if ( ! check_admin_referer( 'groups_accept_invite' ) ) { 21 21 return false; 22 } 22 23 23 24 if ( !groups_accept_invite( bp_loggedin_user_id(), $group_id ) ) { … … 27 28 $group = groups_get_group( $group_id ); 28 29 30 /* translators: %s: group link */ 29 31 bp_core_add_message( sprintf( __( 'Group invite accepted. Visit %s.', 'buddypress' ), bp_get_group_link( $group ) ) ); 30 32
Note: See TracChangeset
for help on using the changeset viewer.