Skip to:
Content

BuddyPress.org

Changeset 12104


Ignore:
Timestamp:
05/21/2018 01:00:36 AM (16 months ago)
Author:
djpaul
Message:

Templates, Nouveau: string improvements

Location:
trunk/src/bp-templates
Files:
63 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/bp-templates/bp-legacy/buddypress/groups/single/request-membership.php

    r12082 r12104  
    1616
    1717<?php if ( !bp_group_has_requested_membership() ) : ?>
    18     <h2 class="bp-screen-reader-text"><?php
    19         /* translators: accessibility text */
    20         _e( 'Request form', 'buddypress' );
    21     ?></h2>
     18    <h2 class="bp-screen-reader-text"><?php esc_html_e( 'Group membership request form', 'buddypress' ); ?></h2>
    2219
    23     <p><?php printf( __( "You are requesting to become a member of the group '%s'.", 'buddypress' ), bp_get_group_name( false ) ); ?></p>
     20    <p>
     21        <?php
     22        echo esc_html(
     23            sprintf(
     24                /* translators:  %s =group name */
     25                __( 'You are requesting to become a member of the group "%s".', 'buddypress' ),
     26                bp_get_group_name()
     27            )
     28        );
     29        ?>
     30    </p>
    2431
    2532    <form action="<?php bp_group_form_action('request-membership' ); ?>" method="post" name="request-membership-form" id="request-membership-form" class="standard-form">
    26         <label for="group-request-membership-comments"><?php _e( 'Comments (optional)', 'buddypress' ); ?></label>
     33        <label for="group-request-membership-comments"><?php esc_html_e( 'Comments (optional)', 'buddypress' ); ?></label>
    2734        <textarea name="group-request-membership-comments" id="group-request-membership-comments"></textarea>
    2835
     
    3643        do_action( 'bp_group_request_membership_content' ); ?>
    3744
    38         <p><input type="submit" name="group-request-send" id="group-request-send" value="<?php esc_attr_e( 'Send Request', 'buddypress' ); ?>" />
     45        <p><input type="submit" name="group-request-send" id="group-request-send" value="<?php echo esc_attr_x( 'Send Request', 'button', 'buddypress' ); ?>" />
    3946
    4047        <?php wp_nonce_field( 'groups_request_membership' ); ?>
  • trunk/src/bp-templates/bp-nouveau/buddypress/activity/activity-loop.php

    r12082 r12104  
    2626
    2727        <li class="load-more">
    28             <a href="<?php bp_activity_load_more_link(); ?>"><?php _e( 'Load More', 'buddypress' ); ?></a>
     28            <a href="<?php bp_activity_load_more_link(); ?>"><?php echo esc_html_x( 'Load More', 'button', 'buddypress' ); ?></a>
    2929        </li>
    3030
  • trunk/src/bp-templates/bp-nouveau/buddypress/activity/comment-form.php

    r12082 r12104  
    1616    <div class="ac-reply-content">
    1717        <div class="ac-textarea">
    18             <label for="ac-input-<?php bp_activity_id(); ?>" class="bp-screen-reader-text"><?php _e( 'Comment', 'buddypress' ); ?></label>
     18            <label for="ac-input-<?php bp_activity_id(); ?>" class="bp-screen-reader-text">
     19                <?php echo esc_html( _x( 'Comment', 'heading', 'buddypress' ) ); ?>
     20            </label>
    1921            <textarea id="ac-input-<?php bp_activity_id(); ?>" class="ac-input bp-suggestions" name="ac_input_<?php bp_activity_id(); ?>"></textarea>
    2022        </div>
    21         <input type="submit" name="ac_form_submit" value="<?php esc_attr_e( 'Post', 'buddypress' ); ?>" /> &nbsp; <button type="button" class="ac-reply-cancel"><?php _e( 'Cancel', 'buddypress' ); ?></button>
     23        <?php
     24        printf(
     25            '<input type="submit" name="ac_form_submit" value="%s" /> &nbsp; <button type="button" class="ac-reply-cancel">%s</button>',
     26            esc_attr( _x( 'Post', 'button', 'buddypress' ) ),
     27            esc_html( _x( 'Cancel', 'button', 'buddypress' ) )
     28        );
     29        ?>
    2230        <input type="hidden" name="comment_form_id" value="<?php bp_activity_id(); ?>" />
    2331    </div>
  • trunk/src/bp-templates/bp-nouveau/buddypress/activity/post-form.php

    r12082 r12104  
    99
    1010<?php
    11 /**
    12  * Template tag to prepare the activity post form
    13  * checks capability and enqueue needed scripts.
     11/*
     12 * Template tag to prepare the activity post form checks capability and enqueue needed scripts.
    1413 */
    1514bp_nouveau_before_activity_post_form();
    1615?>
    1716
    18 <h2 class="bp-screen-reader-text"><?php _e( 'Post Update', 'buddypress' ); ?></h2>
     17<h2 class="bp-screen-reader-text"><?php echo esc_html_x( 'Post Update', 'heading', 'buddypress' ); ?></h2>
    1918
    2019<div id="bp-nouveau-activity-form" class="activity-update-form"></div>
    2120
    2221<?php
    23 /**
    24  * Template tag to load the Javascript
    25  * templates of the Post form UI
     22/*
     23 * Template tag to load the Javascript templates of the Post form UI.
    2624 */
    27 bp_nouveau_after_activity_post_form(); ?>
     25bp_nouveau_after_activity_post_form();
  • trunk/src/bp-templates/bp-nouveau/buddypress/assets/_attachments/avatars/camera.php

    r12082 r12104  
    2020            <div id="avatar-crop-pane" class="avatar" style="width:{{data.w}}px; height:{{data.h}}px"></div>
    2121            <div id="avatar-crop-actions">
    22                 <button type="button" class="button avatar-webcam-capture"><?php esc_html_e( 'Capture', 'buddypress' ); ?></button>
    23                 <button type="button" class="button avatar-webcam-save"><?php esc_html_e( 'Save', 'buddypress' ); ?></button>
     22                <button type="button" class="button avatar-webcam-capture"><?php echo esc_html_x( 'Capture', 'button', 'buddypress' ); ?></button>
     23                <button type="button" class="button avatar-webcam-save"><?php echo esc_html_x( 'Save', 'button', 'buddypress' ); ?></button>
    2424            </div>
    2525        </div>
  • trunk/src/bp-templates/bp-nouveau/buddypress/assets/_attachments/avatars/crop.php

    r12082 r12104  
    1919        </div>
    2020        <div id="avatar-crop-actions">
    21             <button type="button" class="button avatar-crop-submit"><?php esc_html_e( 'Crop Image', 'buddypress' ); ?></button>
     21            <button type="button" class="button avatar-crop-submit"><?php echo esc_html_x( 'Crop Image', 'button', 'buddypress' ); ?></button>
    2222        </div>
    2323    </div>
  • trunk/src/bp-templates/bp-nouveau/buddypress/assets/_attachments/avatars/index.php

    r12082 r12104  
    3333<script id="tmpl-bp-avatar-delete" type="text/html">
    3434    <# if ( 'user' === data.object ) { #>
    35         <p><?php _e( "If you'd like to delete your current profile photo but not upload a new one, please use the delete profile photo button.", 'buddypress' ); ?></p>
     35        <p><?php esc_html_e( "If you'd like to delete your current profile photo, use the delete profile photo button.", 'buddypress' ); ?></p>
    3636        <button type="button" class="button edit" id="bp-delete-avatar"><?php esc_html_e( 'Delete My Profile Photo', 'buddypress' ); ?></button>
    3737    <# } else if ( 'group' === data.object ) { #>
  • trunk/src/bp-templates/bp-nouveau/buddypress/assets/_attachments/cover-images/index.php

    r12082 r12104  
    2222<script id="tmpl-bp-cover-image-delete" type="text/html">
    2323    <# if ( 'user' === data.object ) { #>
    24         <p><?php _e( "If you'd like to delete your current cover image but not upload a new one, please use the delete Cover Image button.", 'buddypress' ); ?></p>
    25         <button type="button" class="button edit" id="bp-delete-cover-image"><?php esc_html_e( 'Delete My Cover Image', 'buddypress' ); ?></button>
     24        <p><?php esc_html_e( "If you'd like to delete your current cover image, use the delete Cover Image button.", 'buddypress' ); ?></p>
     25        <button type="button" class="button edit" id="bp-delete-cover-image">
     26            <?php
     27            echo esc_html_x( 'Delete My Cover Image', 'button', 'buddypress' );
     28            ?>
     29        </button>
    2630    <# } else if ( 'group' === data.object ) { #>
    27         <p><?php _e( "If you'd like to remove the existing group cover image but not upload a new one, please use the delete group cover image button.", 'buddypress' ); ?></p>
    28         <button type="button" class="button edit" id="bp-delete-cover-image"><?php esc_html_e( 'Delete Group Cover Image', 'buddypress' ); ?></button>
     31        <p><?php esc_html_e( "If you'd like to remove the existing group cover image but not upload a new one, please use the delete group cover image button.", 'buddypress' ); ?></p>
     32        <button type="button" class="button edit" id="bp-delete-cover-image">
     33            <?php
     34            echo esc_html_x( 'Delete Group Cover Image', 'button', 'buddypress' );
     35            ?>
     36        </button>
    2937    <# } else { #>
    3038        <?php
  • trunk/src/bp-templates/bp-nouveau/buddypress/assets/_attachments/uploader.php

    r12082 r12104  
    2020                <div class="drag-drop-inside">
    2121                    <p class="drag-drop-info"><?php esc_html_e( 'Drop your file here', 'buddypress' ); ?></p>
    22                     <p><?php _ex( 'or', 'Uploader: Drop your file here - or - Select your File', 'buddypress' ); ?></p>
    23                     <p class="drag-drop-buttons"><label for="{{data.browse_button}}" class="<?php echo is_admin() ? 'screen-reader-text' : 'bp-screen-reader-text'; ?>"><?php esc_html_e( 'Select your File', 'buddypress' ); ?></label><input id="{{data.browse_button}}" type="button" value="<?php esc_attr_e( 'Select your File', 'buddypress' ); ?>" class="button" /></p>
     22
     23                    <p class="drag-drop-buttons">
     24                        <label for="{{data.browse_button}}" class="<?php echo is_admin() ? 'screen-reader-text' : 'bp-screen-reader-text'; ?>">
     25                            <?php esc_html_e( 'Select your file', 'buddypress' ); ?>
     26                        </label>
     27                        <input id="{{data.browse_button}}" type="button" value="<?php echo esc_attr_x( 'Select your file', 'button', 'buddypress' ); ?>" class="button" />
     28                    </p>
    2429                </div>
    2530            </div>
  • trunk/src/bp-templates/bp-nouveau/buddypress/assets/emails/single-bp-email.php

    r12082 r12104  
    218218                        <span class="footer_text"><?php echo nl2br( stripslashes( $settings['footer_text'] ) ); ?></span>
    219219                        <br><br>
    220                         <a href="{{{unsubscribe}}}" style="text-decoration: underline;"><?php _ex( 'unsubscribe', 'email', 'buddypress' ); ?></a>
     220                        <a href="{{{unsubscribe}}}" style="text-decoration: underline;"><?php echo esc_html_x( 'unsubscribe', 'email', 'buddypress' ); ?></a>
    221221
    222222                        <?php
  • trunk/src/bp-templates/bp-nouveau/buddypress/common/js-templates/activity/form.php

    r12082 r12104  
    4040    <# if ( data.selected ) { #>
    4141        <button type="button" class="bp-remove-item dashicons dashicons-no" data-item_id="{{data.id}}">
    42             <span class="bp-screen-reader-text"><?php esc_html_e( 'Remove item', 'buddypress' ); ?></span>
     42            <span class="bp-screen-reader-text"><?php echo esc_html_x( 'Remove item', 'button', 'buddypress' ); ?></span>
    4343        </button>
    4444    <# } #>
  • trunk/src/bp-templates/bp-nouveau/buddypress/common/js-templates/invites/index.php

    r12082 r12104  
    8484    <div class="action">
    8585        <# if ( undefined === data.is_sent || ( false === data.is_sent && true === data.can_edit ) ) { #>
    86             <button type="button" class="button invite-button group-add-remove-invite-button bp-tooltip bp-icons<# if ( data.selected ) { #> selected<# } #>" data-bp-tooltip="<# if ( data.selected ) { #><?php esc_attr_e( 'Disinvite', 'buddypress' ); ?><# } else { #><?php esc_attr_e( 'Invite', 'buddypress' ); ?><# } #>">
     86            <button type="button" class="button invite-button group-add-remove-invite-button bp-tooltip bp-icons<# if ( data.selected ) { #> selected<# } #>" data-bp-tooltip="<# if ( data.selected ) { #><?php esc_attr_e( 'Cancel invitation', 'buddypress' ); ?><# } else { #><?php echo esc_attr_x( 'Invite', 'button', 'buddypress' ); ?><# } #>">
    8787                <span class="icons" aria-hidden="true"></span>
    8888                <span class="bp-screen-reader-text">
    8989                    <# if ( data.selected ) { #>
    90                         <?php esc_html_e( 'Disinvite', 'buddypress' ); ?>
     90                        <?php echo esc_html_x( 'Cancel invitation', 'button', 'buddypress' ); ?>
    9191                    <# } else { #>
    92                         <?php esc_html_e( 'Invite', 'buddypress' ); ?>
     92                        <?php echo esc_html_x( 'Invite', 'button', 'buddypress' ); ?>
    9393                    <# } #>
    9494                </span>
     
    9797
    9898        <# if ( undefined !== data.can_edit && true === data.can_edit ) { #>
    99             <button type="button" class="button invite-button group-remove-invite-button bp-tooltip bp-icons" data-bp-tooltip="<?php esc_attr_e( 'Disinvite', 'buddypress' ); ?>">
     99            <button type="button" class="button invite-button group-remove-invite-button bp-tooltip bp-icons" data-bp-tooltip="<?php echo esc_attr_x( 'Cancel invitation', 'button', 'buddypress' ); ?>">
    100100                <span class=" icons" aria-hidden="true"></span>
    101                 <span class="bp-screen-reader-text"><?php esc_html_e( 'Disinvite', 'buddypress' ); ?></span>
     101                <span class="bp-screen-reader-text"><?php echo esc_attr_x( 'Cancel invitation', 'button', 'buddypress' ); ?></span>
    102102            </button>
    103103        <# } #>
     
    114114<script type="text/html" id="tmpl-bp-invites-form">
    115115
    116     <label for="send-invites-control"><?php esc_attr_e( 'Optional: add a message to your invite.', 'buddypress' ); ?></label>
     116    <label for="send-invites-control"><?php esc_html_e( 'Optional: add a message to your invite.', 'buddypress' ); ?></label>
    117117    <textarea id="send-invites-control" class="bp-faux-placeholder-label"></textarea>
    118118
    119119    <div class="action">
    120         <button type="button" id="bp-invites-reset" class="button bp-secondary-action"><?php _ex( 'Cancel', 'Cancel invitation', 'buddypress' ); ?></button>
    121         <button type="button" id="bp-invites-send" class="button bp-primary-action"><?php _ex( 'Send', 'Send invitation', 'buddypress' ); ?></button>
     120        <button type="button" id="bp-invites-reset" class="button bp-secondary-action"><?php echo esc_html_x( 'Cancel', 'button', 'buddypress' ); ?></button>
     121        <button type="button" id="bp-invites-send" class="button bp-primary-action"><?php echo esc_html_x( 'Send', 'button', 'buddypress' ); ?></button>
    122122    </div>
    123123</script>
     
    127127        <div class="bp-search">
    128128            <form action="" method="get" id="group_invites_search_form" class="bp-invites-search-form" data-bp-search="{{data.scope}}">
    129                 <label for="group_invites_search" class="bp-screen-reader-text"><?php bp_nouveau_search_default_text( 'Search Members', false ); ?></label>
    130                 <input type="search" id="group_invites_search" placeholder="<?php esc_attr_e( 'Search', 'buddypress' ); ?>"/>
     129                <label for="group_invites_search" class="bp-screen-reader-text"><?php bp_nouveau_search_default_text( _x( 'Search Members', 'heading', 'buddypress' ), false ); ?></label>
     130                <input type="search" id="group_invites_search" placeholder="<?php echo esc_attr_x( 'Search', 'search placeholder text', 'buddypress' ); ?>"/>
    131131
    132132                <button type="submit" id="group_invites_search_submit" class="nouveau-search-submit">
    133133                    <span class="dashicons dashicons-search" aria-hidden="true"></span>
    134                     <span id="button-text" class="bp-screen-reader-text"><?php esc_html_e( 'Search', 'buddypress' ); ?></span>
     134                    <span id="button-text" class="bp-screen-reader-text"><?php echo esc_html_x( 'Search', 'button', 'buddypress' ); ?></span>
    135135                </button>
    136136            </form>
     
    141141<script type="text/html" id="tmpl-bp-invites-paginate">
    142142    <# if ( 1 !== data.page ) { #>
    143         <a href="#previous-page" id="bp-invites-prev-page" class="button invite-button bp-tooltip" data-bp-tooltip="<?php esc_attr_e( 'Previous page', 'buddypress' ); ?>">
     143        <a href="#previous-page" id="bp-invites-prev-page" class="button invite-button bp-tooltip" data-bp-tooltip="<?php echo esc_attr_x( 'Previous page', 'link', 'buddypress' ); ?>">
    144144            <span class="dashicons dashicons-arrow-left" aria-hidden="true"></span>
    145             <span class="bp-screen-reader-text"><?php esc_html_e( 'Previous page', 'buddypress' ); ?></span>
     145            <span class="bp-screen-reader-text"><?php echo esc_html_x( 'Previous page', 'link', 'buddypress' ); ?></span>
    146146        </a>
    147147    <# } #>
    148148
    149149    <# if ( data.total_page !== data.page ) { #>
    150         <a href="#next-page" id="bp-invites-next-page" class="button invite-button bp-tooltip" data-bp-tooltip="<?php esc_attr_e( 'Next page', 'buddypress' ); ?>">
    151             <span class="bp-screen-reader-text"><?php esc_html_e( 'Next page', 'buddypress' ); ?></span>
     150        <a href="#next-page" id="bp-invites-next-page" class="button invite-button bp-tooltip" data-bp-tooltip="<?php echo esc_attr_x( 'Next page', 'link', 'buddypress' ); ?>">
     151            <span class="bp-screen-reader-text"><?php echo esc_html_x( 'Next page', 'link', 'buddypress' ); ?></span>
    152152            <span class="dashicons dashicons-arrow-right" aria-hidden="true"></span>
    153153        </button>
  • trunk/src/bp-templates/bp-nouveau/buddypress/common/js-templates/messages/index.php

    r12082 r12104  
    3636
    3737    <div class="submit">
    38         <input type="button" id="bp-messages-send" class="button bp-primary-action" value="<?php esc_attr_e( 'Send', 'buddypress' ); ?>"/>
    39         <input type="button" id="bp-messages-reset" class="text-button small bp-secondary-action" value="<?php esc_attr_e( 'Reset', 'buddypress' ); ?>"/>
     38        <input type="button" id="bp-messages-send" class="button bp-primary-action" value="<?php echo esc_attr_x( 'Send', 'button', 'buddypress' ); ?>"/>
     39        <input type="button" id="bp-messages-reset" class="text-button small bp-secondary-action" value="<?php echo esc_attr_x( 'Reset', 'form reset button', 'buddypress' ); ?>"/>
    4040    </div>
    4141</script>
     
    6060        )
    6161    );
     62
    6263    // Remove the temporary filter on editor buttons
    6364    remove_filter( 'mce_buttons', 'bp_nouveau_messages_mce_buttons', 10, 1 );
     
    6970        <button id="bp-messages-prev-page"class="button messages-button">
    7071            <span class="dashicons dashicons-arrow-left"></span>
    71             <span class="bp-screen-reader-text"><?php esc_html_e( 'Prev', 'buddypress' ); ?></span>
     72            <span class="bp-screen-reader-text"><?php echo esc_html_x( 'Previous page', 'link', 'buddypress' ); ?></span>
    7273        </button>
    7374    <# } #>
     
    7677        <button id="bp-messages-next-page"class="button messages-button">
    7778            <span class="dashicons dashicons-arrow-right"></span>
    78             <span class="bp-screen-reader-text"><?php esc_html_e( 'Next', 'buddypress' ); ?></span>
     79            <span class="bp-screen-reader-text"><?php echo esc_html_x( 'Next page', 'link', 'buddypress' ); ?></span>
    7980        </button>
    8081    <# } #>
     
    8889                    <?php _e( 'Search Messages', 'buddypress' ); ?>
    8990                </label>
    90                 <input type="search" id="user_messages_search" placeholder="<?php esc_attr_e( 'Search', 'buddypress' ); ?>"/>
     91                <input type="search" id="user_messages_search" placeholder="<?php echo esc_attr_x( 'Search', 'search placeholder text', 'buddypress' ); ?>"/>
    9192                <button type="submit" id="user_messages_search_submit">
    9293                    <span class="dashicons dashicons-search" aria-hidden="true"></span>
    93                     <span class="bp-screen-reader-text"><?php esc_html_e( 'Search', 'buddypress' ); ?></span>
     94                    <span class="bp-screen-reader-text"><?php echo esc_html_x( 'Search', 'button', 'buddypress' ); ?></span>
    9495                </button>
    9596            </form>
     
    114115            <span class="select-arrow" aria-hidden="true"></span>
    115116        </div>
    116         <button class="messages-button bulk-apply bp-tooltip" type="submit" data-bp-tooltip="<?php echo esc_attr( 'Apply', 'buddypress' ); ?>">
     117        <button class="messages-button bulk-apply bp-tooltip" type="submit" data-bp-tooltip="<?php echo esc_attr_x( 'Apply', 'button', 'buddypress' ); ?>">
    117118            <span class="dashicons dashicons-yes" aria-hidden="true"></span>
    118             <span class="bp-screen-reader-text"><?php esc_html_e( 'Apply', 'buddypress' ); ?></span>
     119            <span class="bp-screen-reader-text"><?php echo esc_html_x( 'Apply', 'button', 'buddypress' ); ?></span>
    119120        </button>
    120121    </div>
     
    302303                    <?php bp_loggedin_user_avatar( 'type=thumb&height=30&width=30' ); ?>
    303304
    304                     <strong><?php _e( 'Send a Reply', 'buddypress' ); ?></strong>
     305                    <strong><?php esc_html_e( 'Send a Reply', 'buddypress' ); ?></strong>
    305306                </div>
    306307
     
    319320
    320321                <div class="submit">
    321                     <input type="submit" name="send" value="<?php esc_attr_e( 'Send Reply', 'buddypress' ); ?>" id="send_reply_button"/>
     322                    <input type="submit" name="send" value="<?php echo esc_attr_x( 'Send Reply', 'button', 'buddypress' ); ?>" id="send_reply_button"/>
    322323                </div>
    323324
  • trunk/src/bp-templates/bp-nouveau/buddypress/common/notices/template-notices.php

    r12082 r12104  
    1313    <?php if ( bp_nouveau_has_dismiss_button() ) : ?>
    1414
    15         <button type="button" class="bp-tooltip" data-bp-tooltip="<?php esc_attr_e( 'Close', 'buddypress' ); ?>" aria-label="<?php esc_attr_e( 'Close this notice', 'buddypress' ); ?>" data-bp-close="<?php bp_nouveau_dismiss_button_type(); ?>"><span class="dashicons dashicons-dismiss" aria-hidden="true"></span></button>
     15        <button type="button" class="bp-tooltip" data-bp-tooltip="<?php echo esc_attr_x( 'Close', 'button', 'buddypress' ); ?>" aria-label="<?php esc_attr_e( 'Close this notice', 'buddypress' ); ?>" data-bp-close="<?php bp_nouveau_dismiss_button_type(); ?>"><span class="dashicons dashicons-dismiss" aria-hidden="true"></span></button>
    1616
    1717    <?php endif; ?>
  • trunk/src/bp-templates/bp-nouveau/buddypress/common/search-and-filters-bar.php

    r12082 r12104  
    1313
    1414        <?php if ( 'activity' === bp_current_component() ) : ?>
    15             <div class="feed"><a href="<?php bp_sitewide_activity_feed_link(); ?>" class="bp-tooltip" data-bp-tooltip="<?php esc_attr_e( 'RSS Feed', 'buddypress' ); ?>"><span class="bp-screen-reader-text"><?php _e( 'RSS', 'buddypress' ); ?></span></a></div>
     15            <div class="feed"><a href="<?php bp_sitewide_activity_feed_link(); ?>" class="bp-tooltip" data-bp-tooltip="<?php esc_attr_e( 'RSS Feed', 'buddypress' ); ?>"><span class="bp-screen-reader-text"><?php esc_html_e( 'RSS', 'buddypress' ); ?></span></a></div>
    1616        <?php endif; ?>
    1717
  • trunk/src/bp-templates/bp-nouveau/buddypress/common/search/search-form.php

    r12082 r12104  
    1717        <button type="submit" id="<?php bp_nouveau_search_selector_id( 'search-submit' ); ?>" class="nouveau-search-submit" name="<?php bp_nouveau_search_selector_name( 'search_submit' ); ?>">
    1818            <span class="dashicons dashicons-search" aria-hidden="true"></span>
    19             <span id="button-text" class="bp-screen-reader-text"><?php _e( 'Search', 'buddypress' ); ?></span>
     19            <span id="button-text" class="bp-screen-reader-text"><?php echo esc_html_x( 'Search', 'button', 'buddypress' ); ?></span>
    2020        </button>
    2121
  • trunk/src/bp-templates/bp-nouveau/buddypress/groups/create.php

    r12082 r12104  
    88bp_nouveau_groups_create_hook( 'before', 'page' ); ?>
    99
    10     <h2 class="bp-subhead"><?php _e( 'Create A New Group', 'buddypress' ); ?></h2>
     10    <h2 class="bp-subhead"><?php esc_html_e( 'Create A New Group', 'buddypress' ); ?></h2>
    1111
    1212    <?php bp_nouveau_groups_create_hook( 'before', 'content_template' ); ?>
  • trunk/src/bp-templates/bp-nouveau/buddypress/groups/groups-loop.php

    r12082 r12104  
    4545                        <?php endif; ?>
    4646
    47                         <p class="last-activity item-meta"><?php printf( __( 'active %s', 'buddypress' ), bp_get_group_last_active() ); ?></p>
     47                        <p class="last-activity item-meta">
     48                            <?php
     49                            printf(
     50                                /* translators: %s = last activity timestamp (e.g. "active 1 hour ago") */
     51                                __( 'active %s', 'buddypress' ),
     52                                bp_get_group_last_active()
     53                            );
     54                            ?>
     55                        </p>
    4856
    4957                    </div>
  • trunk/src/bp-templates/bp-nouveau/buddypress/groups/single/activity.php

    r12082 r12104  
    1919    <ul>
    2020
    21         <li class="feed"><a href="<?php bp_group_activity_feed_link(); ?>" class="bp-tooltip no-ajax" data-bp-tooltip="<?php esc_attr_e( 'RSS Feed', 'buddypress' ); ?>"><span class="bp-screen-reader-text"><?php _e( 'RSS', 'buddypress' ); ?></span></a></li>
     21        <li class="feed"><a href="<?php bp_group_activity_feed_link(); ?>" class="bp-tooltip no-ajax" data-bp-tooltip="<?php esc_attr_e( 'RSS Feed', 'buddypress' ); ?>"><span class="bp-screen-reader-text"><?php esc_html_e( 'RSS', 'buddypress' ); ?></span></a></li>
    2222
    2323        <li class="group-act-search"><?php bp_nouveau_search_form(); ?></li>
  • trunk/src/bp-templates/bp-nouveau/buddypress/groups/single/admin/delete-group.php

    r12082 r12104  
    99
    1010<h2 class="bp-screen-title warn">
    11     <?php _e( 'Delete this group', 'buddypress' ); ?>
     11    <?php esc_html_e( 'Delete this group', 'buddypress' ); ?>
    1212</h2>
    1313
     
    1616<label for="delete-group-understand" class="bp-label-text warn">
    1717    <input type="checkbox" name="delete-group-understand" id="delete-group-understand" value="1" onclick="if(this.checked) { document.getElementById( 'delete-group-button' ).disabled = ''; } else { document.getElementById( 'delete-group-button' ).disabled = 'disabled'; }" />
    18     <?php _e( 'I understand the consequences of deleting this group.', 'buddypress' ); ?>
     18    <?php esc_html_e( 'I understand the consequences of deleting this group.', 'buddypress' ); ?>
    1919</label>
  • trunk/src/bp-templates/bp-nouveau/buddypress/groups/single/admin/edit-details.php

    r12082 r12104  
    1111
    1212    <h3 class="bp-screen-title creation-step-name">
    13         <?php _e( 'Enter Group Name &amp; Description', 'buddypress' ); ?>
     13        <?php esc_html_e( 'Enter Group Name &amp; Description', 'buddypress' ); ?>
    1414    </h3>
    1515
     
    1717
    1818    <h2 class="bp-screen-title">
    19         <?php _e( 'Edit Group Name &amp; Description', 'buddypress' ); ?>
     19        <?php esc_html_e( 'Edit Group Name &amp; Description', 'buddypress' ); ?>
    2020    </h2>
    2121
    2222<?php endif; ?>
    2323
    24 <label for="group-name"><?php _e( 'Group Name (required)', 'buddypress' ); ?></label>
     24<label for="group-name"><?php esc_html_e( 'Group Name (required)', 'buddypress' ); ?></label>
    2525<input type="text" name="group-name" id="group-name" value="<?php bp_is_group_create() ? bp_new_group_name() : bp_group_name(); ?>" aria-required="true" />
    2626
    27 <label for="group-desc"><?php _e( 'Group Description (required)', 'buddypress' ); ?></label>
     27<label for="group-desc"><?php esc_html_e( 'Group Description (required)', 'buddypress' ); ?></label>
    2828<textarea name="group-desc" id="group-desc" aria-required="true"><?php bp_is_group_create() ? bp_new_group_description() : bp_group_description_editable(); ?></textarea>
    2929
     
    3131    <p class="bp-controls-wrap">
    3232        <label for="group-notify-members" class="bp-label-text">
    33             <input type="checkbox" name="group-notify-members" id="group-notify-members" value="1" /> <?php _e( 'Notify group members of these changes via email', 'buddypress' ); ?>
     33            <input type="checkbox" name="group-notify-members" id="group-notify-members" value="1" /> <?php esc_html_e( 'Notify group members of these changes via email', 'buddypress' ); ?>
    3434        </label>
    3535    </p>
  • trunk/src/bp-templates/bp-nouveau/buddypress/groups/single/admin/group-avatar.php

    r12082 r12104  
    2424<?php if ( ! bp_is_group_create() ) : ?>
    2525    <?php if ( ! bp_get_group_has_avatar() ) : ?>
    26         <p class="bp-help-text"><?php _e( 'Add an image to use as a profile photo for this group. The image will be shown on the main group page, and in search results.', 'buddypress' ); ?></p>
     26        <p class="bp-help-text"><?php esc_html_e( 'Add an image to use as a profile photo for this group. The image will be shown on the main group page, and in search results.', 'buddypress' ); ?></p>
    2727    <?php else : ?>
    28         <p class="bp-help-text"><?php _e( 'Edit or update your avatar image for this group.', 'buddypress' ); ?></p>
     28        <p class="bp-help-text"><?php esc_html_e( 'Edit or update your avatar image for this group.', 'buddypress' ); ?></p>
    2929    <?php endif; ?>
    3030<?php endif; ?>
     
    4444    <?php endif; ?>
    4545
    46             <p class="bp-help-text"><?php _e( 'Upload an image to use as a profile photo for this group. The image will be shown on the main group page, and in search results.', 'buddypress' ); ?></p>
     46            <p class="bp-help-text"><?php esc_html_e( 'Upload an image to use as a profile photo for this group. The image will be shown on the main group page, and in search results.', 'buddypress' ); ?></p>
    4747
    4848            <p>
    49                 <label for="file" class="bp-screen-reader-text"><?php _e( 'Select an image', 'buddypress' ); ?></label>
     49                <label for="file" class="bp-screen-reader-text"><?php esc_html_e( 'Select an image', 'buddypress' ); ?></label>
    5050                <input type="file" name="file" id="file" />
    5151                <input type="submit" name="upload" id="upload" value="<?php esc_attr_e( 'Upload Image', 'buddypress' ); ?>" />
     
    5454
    5555    <?php if ( bp_is_group_create() ) : ?>
    56             <p class="bp-help-text"><?php _e( 'To skip the group profile photo upload process, hit the "Next Step" button.', 'buddypress' ); ?></p>
     56            <p class="bp-help-text"><?php esc_html_e( 'To skip the group profile photo upload process, hit the "Next Step" button.', 'buddypress' ); ?></p>
    5757        </div><!-- .main-column -->
    5858
    5959    <?php elseif ( bp_get_group_has_avatar() ) : ?>
    6060
    61         <p><?php _e( "If you'd like to remove the existing group profile photo but not upload a new one, please use the delete group profile photo button.", 'buddypress' ); ?></p>
     61        <p><?php esc_html_e( "If you'd like to remove the existing group profile photo but not upload a new one, please use the delete group profile photo button.", 'buddypress' ); ?></p>
    6262
    6363        <?php
     
    9696?>
    9797
    98     <h2><?php _e( 'Crop Group Profile Photo', 'buddypress' ); ?></h2>
     98    <h2><?php esc_html_e( 'Crop Group Profile Photo', 'buddypress' ); ?></h2>
    9999
    100100    <img src="<?php bp_avatar_to_crop(); ?>" id="avatar-to-crop" class="avatar" alt="<?php esc_attr_e( 'Profile photo to crop', 'buddypress' ); ?>" />
  • trunk/src/bp-templates/bp-nouveau/buddypress/groups/single/admin/group-cover-image.php

    r12082 r12104  
    2424<?php endif; ?>
    2525
    26 <p><?php _e( 'The Cover Image will be used to customize the header of your group.', 'buddypress' ); ?></p>
     26<p><?php esc_html_e( 'The Cover Image will be used to customize the header of your group.', 'buddypress' ); ?></p>
    2727
    2828<?php
  • trunk/src/bp-templates/bp-nouveau/buddypress/groups/single/admin/group-settings.php

    r12082 r12104  
    2525
    2626    <fieldset class="radio group-status-type">
    27         <legend><?php _e( 'Privacy Options', 'buddypress' ); ?></legend>
     27        <legend><?php esc_html_e( 'Privacy Options', 'buddypress' ); ?></legend>
    2828
    2929        <label for="group-status-public">
    30             <input type="radio" name="group-status" id="group-status-public" value="public"<?php if ( 'public' === bp_get_new_group_status() || ! bp_get_new_group_status() ) { ?> checked="checked"<?php } ?> aria-describedby="public-group-description" /> <?php _e( 'This is a public group', 'buddypress' ); ?>
     30            <input type="radio" name="group-status" id="group-status-public" value="public"<?php if ( 'public' === bp_get_new_group_status() || ! bp_get_new_group_status() ) { ?> checked="checked"<?php } ?> aria-describedby="public-group-description" /> <?php esc_html_e( 'This is a public group', 'buddypress' ); ?>
    3131        </label>
    3232
    3333        <ul id="public-group-description">
    34             <li><?php _e( 'Any site member can join this group.', 'buddypress' ); ?></li>
    35             <li><?php _e( 'This group will be listed in the groups directory and in search results.', 'buddypress' ); ?></li>
    36             <li><?php _e( 'Group content and activity will be visible to any site member.', 'buddypress' ); ?></li>
     34            <li><?php esc_html_e( 'Any site member can join this group.', 'buddypress' ); ?></li>
     35            <li><?php esc_html_e( 'This group will be listed in the groups directory and in search results.', 'buddypress' ); ?></li>
     36            <li><?php esc_html_e( 'Group content and activity will be visible to any site member.', 'buddypress' ); ?></li>
    3737        </ul>
    3838
    3939        <label for="group-status-private">
    40             <input type="radio" name="group-status" id="group-status-private" value="private"<?php if ( 'private' === bp_get_new_group_status() ) { ?> checked="checked"<?php } ?> aria-describedby="private-group-description" /> <?php _e( 'This is a private group', 'buddypress' ); ?>
     40            <input type="radio" name="group-status" id="group-status-private" value="private"<?php if ( 'private' === bp_get_new_group_status() ) { ?> checked="checked"<?php } ?> aria-describedby="private-group-description" /> <?php esc_html_e( 'This is a private group', 'buddypress' ); ?>
    4141        </label>
    4242
    4343        <ul id="private-group-description">
    44             <li><?php _e( 'Only users who request membership and are accepted can join the group.', 'buddypress' ); ?></li>
    45             <li><?php _e( 'This group will be listed in the groups directory and in search results.', 'buddypress' ); ?></li>
    46             <li><?php _e( 'Group content and activity will only be visible to members of the group.', 'buddypress' ); ?></li>
     44            <li><?php esc_html_e( 'Only people who request membership and are accepted can join the group.', 'buddypress' ); ?></li>
     45            <li><?php esc_html_e( 'This group will be listed in the groups directory and in search results.', 'buddypress' ); ?></li>
     46            <li><?php esc_html_e( 'Group content and activity will only be visible to members of the group.', 'buddypress' ); ?></li>
    4747        </ul>
    4848
    4949        <label for="group-status-hidden">
    50             <input type="radio" name="group-status" id="group-status-hidden" value="hidden"<?php if ( 'hidden' === bp_get_new_group_status() ) { ?> checked="checked"<?php } ?> aria-describedby="hidden-group-description" /> <?php _e( 'This is a hidden group', 'buddypress' ); ?>
     50            <input type="radio" name="group-status" id="group-status-hidden" value="hidden"<?php if ( 'hidden' === bp_get_new_group_status() ) { ?> checked="checked"<?php } ?> aria-describedby="hidden-group-description" /> <?php esc_html_e( 'This is a hidden group', 'buddypress' ); ?>
    5151        </label>
    5252
    5353        <ul id="hidden-group-description">
    54             <li><?php _e( 'Only users who are invited can join the group.', 'buddypress' ); ?></li>
    55             <li><?php _e( 'This group will not be listed in the groups directory or search results.', 'buddypress' ); ?></li>
    56             <li><?php _e( 'Group content and activity will only be visible to members of the group.', 'buddypress' ); ?></li>
     54            <li><?php esc_html_e( 'Only people who are invited can join the group.', 'buddypress' ); ?></li>
     55            <li><?php esc_html_e( 'This group will not be listed in the groups directory or search results.', 'buddypress' ); ?></li>
     56            <li><?php esc_html_e( 'Group content and activity will only be visible to members of the group.', 'buddypress' ); ?></li>
    5757        </ul>
    5858
    5959    </fieldset>
    6060
    61 <?php // Group type selection ?>
    62 <?php if ( $group_types = bp_groups_get_group_types( array( 'show_in_create_screen' => true ), 'objects' ) ) : ?>
     61<?php
     62// Group type selection
     63$group_types = bp_groups_get_group_types( array( 'show_in_create_screen' => true ), 'objects' );
     64if ( $group_types ) : ?>
    6365
    6466    <fieldset class="group-create-types">
    65         <legend><?php _e( 'Group Types', 'buddypress' ); ?></legend>
     67        <legend><?php esc_html_e( 'Group Types', 'buddypress' ); ?></legend>
    6668
    67         <p tabindex="0"><?php _e( 'Select the types this group should be a part of.', 'buddypress' ); ?></p>
     69        <p tabindex="0"><?php esc_html_e( 'Select the types this group should be a part of.', 'buddypress' ); ?></p>
    6870
    6971        <?php foreach ( $group_types as $type ) : ?>
     
    8688
    8789    <fieldset class="radio group-invitations">
    88         <legend><?php _e( 'Group Invitations', 'buddypress' ); ?></legend>
     90        <legend><?php esc_html_e( 'Group Invitations', 'buddypress' ); ?></legend>
    8991
    90         <p tabindex="0"><?php _e( 'Which members of this group are allowed to invite others?', 'buddypress' ); ?></p>
     92        <p tabindex="0"><?php esc_html_e( 'Which members of this group are allowed to invite others?', 'buddypress' ); ?></p>
    9193
    9294        <label for="group-invite-status-members">
    9395            <input type="radio" name="group-invite-status" id="group-invite-status-members" value="members"<?php bp_group_show_invite_status_setting( 'members' ); ?> />
    94                 <?php _e( 'All group members', 'buddypress' ); ?>
     96                <?php esc_html_e( 'All group members', 'buddypress' ); ?>
    9597        </label>
    9698
    9799        <label for="group-invite-status-mods">
    98100            <input type="radio" name="group-invite-status" id="group-invite-status-mods" value="mods"<?php bp_group_show_invite_status_setting( 'mods' ); ?> />
    99                 <?php _e( 'Group admins and mods only', 'buddypress' ); ?>
     101                <?php esc_html_e( 'Group admins and mods only', 'buddypress' ); ?>
    100102        </label>
    101103
    102104        <label for="group-invite-status-admins">
    103105            <input type="radio" name="group-invite-status" id="group-invite-status-admins" value="admins"<?php bp_group_show_invite_status_setting( 'admins' ); ?> />
    104                 <?php _e( 'Group admins only', 'buddypress' ); ?>
     106                <?php esc_html_e( 'Group admins only', 'buddypress' ); ?>
    105107        </label>
    106108
  • trunk/src/bp-templates/bp-nouveau/buddypress/groups/single/admin/manage-members.php

    r12082 r12104  
    99
    1010<h2 class="bp-screen-title <?php if ( bp_is_group_create() ) { echo esc_attr( 'creation-step-name' ); } ?>">
    11     <?php _e( 'Manage Group Members', 'buddypress' ); ?>
     11    <?php esc_html_e( 'Manage Group Members', 'buddypress' ); ?>
    1212</h2>
    1313
    14     <p class="bp-help-text"><?php _e( 'Manage your group members; promote to moderators, admins or demote or ban.', 'buddypress' ); ?></p>
     14    <p class="bp-help-text"><?php esc_html_e( 'Manage your group members; promote to moderators, admins or demote or ban.', 'buddypress' ); ?></p>
    1515
    1616    <dl class="groups-manage-members-list">
    1717
    18     <dt class="admin-section section-title"><?php _e( 'Administrators', 'buddypress' ); ?></dt>
     18    <dt class="admin-section section-title"><?php esc_html_e( 'Administrators', 'buddypress' ); ?></dt>
    1919
    2020    <?php if ( bp_has_members( '&include=' . bp_group_admin_ids() ) ) : ?>
     
    3333
    3434                        <p class="action text-links-list">
    35                             <a class="button confirm admin-demote-to-member" href="<?php bp_group_member_demote_link( bp_get_member_user_id() ); ?>"><?php _e( 'Demote to Member', 'buddypress' ); ?></a>
     35                            <a class="button confirm admin-demote-to-member" href="<?php bp_group_member_demote_link( bp_get_member_user_id() ); ?>"><?php esc_html_e( 'Demote to Member', 'buddypress' ); ?></a>
    3636                        </p>
    3737
     
    4747    <?php if ( bp_group_has_moderators() ) : ?>
    4848
    49         <dt class="moderator-section section-title"><?php _e( 'Moderators', 'buddypress' ); ?></dt>
     49        <dt class="moderator-section section-title"><?php esc_html_e( 'Moderators', 'buddypress' ); ?></dt>
    5050
    5151        <dd class="moderator-listing">
     
    6262
    6363                    <div class="members-manage-buttons action text-links-list">
    64                         <a href="<?php bp_group_member_promote_admin_link( array( 'user_id' => bp_get_member_user_id() ) ); ?>" class="button confirm mod-promote-to-admin"><?php _e( 'Promote to Admin', 'buddypress' ); ?></a>
    65                         <a class="button confirm mod-demote-to-member" href="<?php bp_group_member_demote_link( bp_get_member_user_id() ); ?>"><?php _e( 'Demote to Member', 'buddypress' ); ?></a>
     64                        <a href="<?php bp_group_member_promote_admin_link( array( 'user_id' => bp_get_member_user_id() ) ); ?>" class="button confirm mod-promote-to-admin"><?php esc_html_e( 'Promote to Admin', 'buddypress' ); ?></a>
     65                        <a class="button confirm mod-demote-to-member" href="<?php bp_group_member_demote_link( bp_get_member_user_id() ); ?>"><?php esc_html_e( 'Demote to Member', 'buddypress' ); ?></a>
    6666                    </div>
    6767
     
    9696                        <p class="list-title member-name">
    9797                            <?php bp_group_member_link(); ?>
    98                             <span class="banned warn"><?php if ( bp_get_group_member_is_banned() ) _e( '(banned)', 'buddypress' ); ?></span>
     98                            <span class="banned warn">
     99                                <?php if ( bp_get_group_member_is_banned() ) : ?>
     100                                    <?php
     101                                    /* translators: indicates a user is banned from a group, e.g. "Mike (banned)". */
     102                                    esc_html_e( '(banned)', 'buddypress' );
     103                                    ?>
     104                                <?php endif; ?>
     105                            </span>
    99106                        </p>
    100107
  • trunk/src/bp-templates/bp-nouveau/buddypress/groups/single/cover-image-header.php

    r12082 r12104  
    2525        <div id="item-header-content">
    2626
     27            <p class="highlight group-status"><strong><?php echo esc_html( bp_nouveau_group_meta()->status ); ?></strong></p>
     28            <p class="activity" data-livestamp="<?php bp_core_iso8601_date( bp_get_group_last_active( 0, array( 'relative' => false ) ) ); ?>">
     29                <?php
     30                /* translators: %s = last activity timestamp (e.g. "active 1 hour ago") */
     31                printf( __( 'active %s', 'buddypress' ), bp_get_group_last_active() );
     32                ?>
     33            </p>
    2734
    28 
    29             <p class="highlight group-status"><strong><?php echo esc_html( bp_nouveau_group_meta()->status ); ?></strong></p>
    30             <p 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() ); ?></p>
    3135            <?php echo bp_nouveau_group_meta()->group_type_list; ?>
    32 
    3336            <?php bp_nouveau_group_hook( 'before', 'header_meta' ); ?>
    3437
     
    5356</div><!-- #cover-image-container -->
    5457
    55 <?php   if ( ! bp_nouveau_groups_front_page_description() ) : ?>
    56 <?php if ( bp_nouveau_group_meta()->description ) { ?>
    57     <div class="desc-wrap">
    58         <div class="group-description">
    59         <?php echo bp_nouveau_group_meta()->description; ?>
    60     </div><!-- //.group_description -->
    61 </div>
    62 <?php   } ?>
     58<?php if ( ! bp_nouveau_groups_front_page_description() ) : ?>
     59    <?php if ( ! empty( bp_nouveau_group_meta()->description ) ) : ?>
     60        <div class="desc-wrap">
     61            <div class="group-description">
     62            <?php echo esc_html( bp_nouveau_group_meta()->description ); ?>
     63        </div><!-- //.group_description -->
     64    </div>
     65    <?php endif; ?>
    6366<?php endif; ?>
  • trunk/src/bp-templates/bp-nouveau/buddypress/groups/single/group-header.php

    r12082 r12104  
    2424    <p class="highlight group-status"><strong><?php echo esc_html( bp_nouveau_group_meta()->status ); ?></strong></p>
    2525
    26     <p 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() ); ?></p>
     26    <p class="activity" data-livestamp="<?php bp_core_iso8601_date( bp_get_group_last_active( 0, array( 'relative' => false ) ) ); ?>">
     27        <?php
     28        echo esc_html(
     29            sprintf(
     30                /* translators: %s = last activity timestamp (e.g. "active 1 hour ago") */
     31                __( 'active %s', 'buddypress' ),
     32                bp_get_group_last_active()
     33            )
     34        );
     35        ?>
     36    </p>
    2737
    2838    <?php bp_nouveau_group_hook( 'before', 'header_meta' ); ?>
  • trunk/src/bp-templates/bp-nouveau/buddypress/groups/single/parts/header-item-actions.php

    r12082 r12104  
    1111    <?php if ( bp_current_user_can( 'groups_access_group' ) ) : ?>
    1212
    13         <h2 class="bp-screen-reader-text"><?php esc_html_e( 'Leadership', 'buddypress' ); ?></h2>
     13        <h2 class="bp-screen-reader-text"><?php esc_html_e( 'Group Leadership', 'buddypress' ); ?></h2>
    1414
    1515        <dl class="moderators-lists">
    16             <dt class="moderators-title"><?php _e( 'Group Admins', 'buddypress' ); ?></dt>
     16            <dt class="moderators-title"><?php esc_html_e( 'Group Administrators', 'buddypress' ); ?></dt>
    1717            <dd class="user-list admins"><?php bp_group_list_admins(); ?>
    1818                <?php bp_nouveau_group_hook( 'after', 'menu_admins' ); ?>
     
    2626
    2727            <dl class="moderators-lists">
    28                 <dt class="moderators-title"><?php _e( 'Group Mods', 'buddypress' ); ?></dt>
     28                <dt class="moderators-title"><?php esc_html_e( 'Group Mods', 'buddypress' ); ?></dt>
    2929                <dd class="user-list moderators">
    3030                    <?php
  • trunk/src/bp-templates/bp-nouveau/buddypress/groups/single/request-membership.php

    r12082 r12104  
    1010
    1111<?php if ( ! bp_group_has_requested_membership() ) : ?>
    12     <p><?php printf( __( 'You are requesting to become a member of the group \'%s\'.', 'buddypress' ), bp_get_group_name( false ) ); ?></p>
     12    <p>
     13        <?php
     14        echo esc_html(
     15            sprintf(
     16                /* translators: %s = group name */
     17                __( 'You are requesting to become a member of the group "%s".', 'buddypress' ),
     18                bp_get_group_name()
     19            )
     20        );
     21        ?>
     22    </p>
    1323
    1424    <form action="<?php bp_group_form_action( 'request-membership' ); ?>" method="post" name="request-membership-form" id="request-membership-form" class="standard-form">
    15         <label for="group-request-membership-comments"><?php _e( 'Comments (optional)', 'buddypress' ); ?></label>
     25        <label for="group-request-membership-comments"><?php esc_html( 'Comments (optional)', 'buddypress' ); ?></label>
    1626        <textarea name="group-request-membership-comments" id="group-request-membership-comments"></textarea>
    1727
    1828        <?php bp_nouveau_group_hook( '', 'request_membership_content' ); ?>
    1929
    20         <p><input type="submit" name="group-request-send" id="group-request-send" value="<?php esc_attr_e( 'Send Request', 'buddypress' ); ?>" />
     30        <p><input type="submit" name="group-request-send" id="group-request-send" value="<?php echo esc_attr_x( 'Send Request', 'button', 'buddypress' ); ?>" />
    2131
    2232        <?php wp_nonce_field( 'groups_request_membership' ); ?>
  • trunk/src/bp-templates/bp-nouveau/buddypress/members/activate.php

    r12082 r12104  
    1818
    1919            <?php if ( isset( $_GET['e'] ) ) : ?>
    20                 <p><?php _e( 'Your account was activated successfully! Your account details have been sent to you in a separate email.', 'buddypress' ); ?></p>
     20                <p><?php esc_html_e( 'Your account was activated successfully! Your account details have been sent to you in a separate email.', 'buddypress' ); ?></p>
    2121            <?php else : ?>
    22                 <p><?php printf( __( 'Your account was activated successfully! You can now <a href="%s">log in</a> with the username and password you provided when you signed up.', 'buddypress' ), wp_login_url( bp_get_root_domain() ) ); ?></p>
     22                <p>
     23                    <?php
     24                    echo esc_html(
     25                        sprintf(
     26                            __( 'Your account was activated successfully! You can now <a href="%s">log in</a> with the username and password you provided when you signed up.', 'buddypress' ),
     27                            wp_login_url( bp_get_root_domain() )
     28                        )
     29                    );
     30                    ?>
     31                </p>
    2332            <?php endif; ?>
    2433
    2534        <?php else : ?>
    2635
    27             <p><?php _e( 'Please provide a valid activation key.', 'buddypress' ); ?></p>
     36            <p><?php esc_html_e( 'Please provide a valid activation key.', 'buddypress' ); ?></p>
    2837
    2938            <form action="" method="post" class="standard-form" id="activation-form">
    3039
    31                 <label for="key"><?php _e( 'Activation Key:', 'buddypress' ); ?></label>
     40                <label for="key"><?php esc_html_e( 'Activation Key:', 'buddypress' ); ?></label>
    3241                <input type="text" name="key" id="key" value="<?php echo esc_attr( bp_get_current_activation_key() ); ?>" />
    3342
    3443                <p class="submit">
    35                     <input type="submit" name="submit" value="<?php esc_attr_e( 'Activate', 'buddypress' ); ?>" />
     44                    <input type="submit" name="submit" value="<?php echo esc_attr_x( 'Activate', 'button', 'buddypress' ); ?>" />
    3645                </p>
    3746
  • trunk/src/bp-templates/bp-nouveau/buddypress/members/register.php

    r12082 r12104  
    2929                    <?php /***** Basic Account Details ******/ ?>
    3030
    31                     <h2 class="bp-heading"><?php _e( 'Account Details', 'buddypress' ); ?></h2>
     31                    <h2 class="bp-heading"><?php esc_html_e( 'Account Details', 'buddypress' ); ?></h2>
    3232
    3333                    <?php bp_nouveau_signup_form(); ?>
     
    4545                    <div class="register-section extended-profile" id="profile-details-section">
    4646
    47                         <h2 class="bp-heading"><?php _e( 'Profile Details', 'buddypress' ); ?></h2>
     47                        <h2 class="bp-heading"><?php esc_html_e( 'Profile Details', 'buddypress' ); ?></h2>
    4848
    4949                        <?php /* Use the profile field loop to render input fields for the 'base' profile field group */ ?>
     
    8787                    <div class="register-section blog-details" id="blog-details-section">
    8888
    89                         <h2><?php _e( 'Blog Details', 'buddypress' ); ?></h2>
     89                        <h2><?php esc_html_e( 'Site Details', 'buddypress' ); ?></h2>
    9090
    91                         <p><label for="signup_with_blog"><input type="checkbox" name="signup_with_blog" id="signup_with_blog" value="1" <?php checked( (int) bp_get_signup_with_blog_value(), 1 ); ?>/> <?php _e( "Yes, I'd like to create a new site", 'buddypress' ); ?></label></p>
     91                        <p><label for="signup_with_blog"><input type="checkbox" name="signup_with_blog" id="signup_with_blog" value="1" <?php checked( (int) bp_get_signup_with_blog_value(), 1 ); ?>/> <?php esc_html_e( "Yes, i'd like to create a new site", 'buddypress' ); ?></label></p>
    9292
    9393                        <div id="blog-details"<?php if ( (int) bp_get_signup_with_blog_value() ) : ?>class="show"<?php endif; ?>>
  • trunk/src/bp-templates/bp-nouveau/buddypress/members/single/default-front.php

    r12082 r12104  
    1414        <div class="bp-feedback custom-homepage-info info">
    1515            <strong><?php esc_html_e( 'Manage the members default front page', 'buddypress' ); ?></strong>
    16             <button type="button" class="bp-tooltip" data-bp-tooltip="<?php esc_attr_e( 'Close', 'buddypress' ); ?>" aria-label="<?php esc_attr_e( 'Close this notice', 'buddypress' ); ?>" data-bp-close="remove"><span class="dashicons dashicons-dismiss" aria-hidden="true"></span></button><br/>
     16            <button type="button" class="bp-tooltip" data-bp-tooltip="<?php echo esc_attr_x( 'Close', 'button', 'buddypress' ); ?>" aria-label="<?php esc_attr_e( 'Close this notice', 'buddypress' ); ?>" data-bp-close="remove"><span class="dashicons dashicons-dismiss" aria-hidden="true"></span></button><br/>
    1717            <?php
    1818            printf(
  • trunk/src/bp-templates/bp-nouveau/buddypress/members/single/groups/invites.php

    r12082 r12104  
    3434                        <h2 class="list-title groups-title"><?php bp_group_link(); ?></h2>
    3535                        <p class="meta group-details">
    36                             <span class="small"> - <?php printf( _nx( '%d member', '%d members', bp_get_group_total_members( false ), 'Group member count', 'buddypress' ), bp_get_group_total_members( false ) ); ?></span>
     36                            <span class="small">
     37                            <?php
     38                            printf(
     39                                /* translators: %s = number of members */
     40                                _n(
     41                                    '%s member',
     42                                    '%s members',
     43                                    bp_get_group_total_members( false ),
     44                                    'buddypress'
     45                                ),
     46                                number_format_i18n( bp_get_group_total_members( false ) )
     47                            );
     48                            ?>
     49                            </span>
    3750                        </p>
    3851
  • trunk/src/bp-templates/bp-nouveau/buddypress/members/single/notifications/notifications-loop.php

    r12082 r12104  
    1616                <tr>
    1717                    <th class="icon"></th>
    18                     <th class="bulk-select-all"><input id="select-all-notifications" type="checkbox"><label class="bp-screen-reader-text" for="select-all-notifications"><?php _e( 'Select all', 'buddypress' ); ?></label></th>
    19                     <th class="title"><?php _e( 'Notification', 'buddypress' ); ?></th>
     18                    <th class="bulk-select-all"><input id="select-all-notifications" type="checkbox"><label class="bp-screen-reader-text" for="select-all-notifications"><?php esc_html_e( 'Select all', 'buddypress' ); ?></label></th>
     19                    <th class="title"><?php esc_html_e( 'Notification', 'buddypress' ); ?></th>
    2020                    <th class="date">
    21                         <?php _e( 'Date Received', 'buddypress' ); ?>
     21                        <?php esc_html_e( 'Date Received', 'buddypress' ); ?>
    2222                        <?php bp_nouveau_notifications_sort_order_links(); ?>
    2323                    </th>
    24                     <th class="actions"><?php _e( 'Actions', 'buddypress' ); ?></th>
     24                    <th class="actions"><?php esc_html_e( 'Actions', 'buddypress' ); ?></th>
    2525                </tr>
    2626            </thead>
     
    3535                    <tr>
    3636                        <td></td>
    37                         <td class="bulk-select-check"><label for="<?php bp_the_notification_id(); ?>"><input id="<?php bp_the_notification_id(); ?>" type="checkbox" name="notifications[]" value="<?php bp_the_notification_id(); ?>" class="notification-check"><span class="bp-screen-reader-text"><?php _e( 'Select this notification', 'buddypress' ); ?></span></label></td>
     37                        <td class="bulk-select-check"><label for="<?php bp_the_notification_id(); ?>"><input id="<?php bp_the_notification_id(); ?>" type="checkbox" name="notifications[]" value="<?php bp_the_notification_id(); ?>" class="notification-check"><span class="bp-screen-reader-text"><?php esc_html_e( 'Select this notification', 'buddypress' ); ?></span></label></td>
    3838                        <td class="notification-description"><?php bp_the_notification_description(); ?></td>
    3939                        <td class="notification-since"><?php bp_the_notification_time_since(); ?></td>
  • trunk/src/bp-templates/bp-nouveau/buddypress/members/single/parts/item-nav.php

    r12082 r12104  
    88?>
    99
    10 <nav class="<?php bp_nouveau_single_item_nav_classes(); ?>" id="object-nav" role="navigation" aria-label="<?php esc_attr_e( 'User menu', 'buddypress' ); ?>">
     10<nav class="<?php bp_nouveau_single_item_nav_classes(); ?>" id="object-nav" role="navigation" aria-label="<?php esc_attr_e( 'Member menu', 'buddypress' ); ?>">
    1111
    1212    <?php if ( bp_nouveau_has_nav( array( 'type' => 'primary' ) ) ) : ?>
  • trunk/src/bp-templates/bp-nouveau/buddypress/members/single/parts/profile-visibility.php

    r12082 r12104  
    1818        <?php
    1919        printf(
     20            /* translators: field visibility level, e.g. "...seen by: everyone". */
    2021            __( 'This field may be seen by: %s', 'buddypress' ),
    2122            '<span class="current-visibility-level">' . bp_get_the_profile_field_visibility_level_label() . '</span>'
    2223        );
    2324        ?>
    24         <button class="visibility-toggle-link text-button" type="button"><?php _e( 'Change', 'buddypress' ); ?></button>
     25        <button class="visibility-toggle-link text-button" type="button"><?php echo esc_html_x( 'Change', 'button', 'buddypress' ); ?></button>
    2526
    2627    </p>
     
    2829    <div class="field-visibility-settings" id="field-visibility-settings-<?php bp_the_profile_field_id(); ?>">
    2930        <fieldset>
    30             <legend><?php _e( 'Who is allowed to see this field?', 'buddypress' ); ?></legend>
     31            <legend><?php esc_html_e( 'Who is allowed to see this field?', 'buddypress' ); ?></legend>
    3132
    3233            <?php bp_profile_visibility_radio_buttons(); ?>
    3334
    3435        </fieldset>
    35         <button class="field-visibility-settings-close button" type="button"><?php _e( 'Close', 'buddypress' ); ?></button>
     36        <button class="field-visibility-settings-close button" type="button"><?php echo esc_html_x( 'Close', 'button', 'buddypress' ); ?></button>
    3637    </div>
    3738
     
    4142        <?php
    4243        printf(
    43             __( 'This field may be seen by: %s', 'buddypress' ),
     44            esc_html__( 'This field may be seen by: %s', 'buddypress' ),
    4445            '<span class="current-visibility-level">' . bp_get_the_profile_field_visibility_level_label() . '</span>'
    4546        );
  • trunk/src/bp-templates/bp-nouveau/buddypress/members/single/profile/change-avatar.php

    r12082 r12104  
    88?>
    99
    10 <h2 class="screen-heading change-avatar-screen"><?php _e( 'Change Profile Photo', 'buddypress' ); ?></h2>
     10<h2 class="screen-heading change-avatar-screen"><?php esc_html_e( 'Change Profile Photo', 'buddypress' ); ?></h2>
    1111
    1212<?php bp_nouveau_member_hook( 'before', 'avatar_upload_content' ); ?>
     
    1616    <p class="bp-feedback info">
    1717        <span class="bp-icon" aria-hidden="true"></span>
    18         <span class="bp-help-text"><?php _e( 'Your profile photo will be used on your profile and throughout the site. If there is a <a href="https://gravatar.com">Gravatar</a> associated with your account email we will use that, or you can upload an image from your computer.', 'buddypress' ); ?></span>
     18        <span class="bp-help-text"><?php esc_html_e( 'Your profile photo will be used on your profile and throughout the site. If there is a <a href="https://gravatar.com">Gravatar</a> associated with your account email we will use that, or you can upload an image from your computer.', 'buddypress' ); ?></span>
    1919    </p>
    2020
     
    2424
    2525            <?php wp_nonce_field( 'bp_avatar_upload' ); ?>
    26             <p class="bp-help-text"><?php _e( "Click below to select a JPG, GIF or PNG format photo from your computer and then click 'Upload Image' to proceed.", 'buddypress' ); ?></p>
     26            <p class="bp-help-text"><?php esc_html_e( "Click below to select a JPG, GIF or PNG format photo from your computer and then click 'Upload Image' to proceed.", 'buddypress' ); ?></p>
    2727
    2828            <p id="avatar-upload">
    29                 <label for="file" class="bp-screen-reader-text"><?php _e( 'Select an image', 'buddypress' ); ?></label>
     29                <label for="file" class="bp-screen-reader-text"><?php esc_html_e( 'Select an image', 'buddypress' ); ?></label>
    3030                <input type="file" name="file" id="file" />
    3131                <input type="submit" name="upload" id="upload" value="<?php esc_attr_e( 'Upload Image', 'buddypress' ); ?>" />
     
    3434
    3535            <?php if ( bp_get_user_has_avatar() ) : ?>
    36                 <p class="bp-help-text"><?php _e( "If you'd like to delete your current profile photo but not upload a new one, please use the delete profile photo button.", 'buddypress' ); ?></p>
    37                 <p><a class="button edit" href="<?php bp_avatar_delete_link(); ?>"><?php _e( 'Delete My Profile Photo', 'buddypress' ); ?></a></p>
     36                <p class="bp-help-text"><?php esc_html_e( "If you'd like to delete your current profile photo, use the delete profile photo button.", 'buddypress' ); ?></p>
     37                <p><a class="button edit" href="<?php bp_avatar_delete_link(); ?>"><?php esc_html_e( 'Delete My Profile Photo', 'buddypress' ); ?></a></p>
    3838            <?php endif; ?>
    3939
     
    4242        <?php if ( 'crop-image' === bp_get_avatar_admin_step() ) : ?>
    4343
    44             <p class="bp-help-text screen-header"><?php _e( 'Crop Your New Profile Photo', 'buddypress' ); ?></p>
     44            <p class="bp-help-text screen-header"><?php esc_html_e( 'Crop Your New Profile Photo', 'buddypress' ); ?></p>
    4545
    4646            <img src="<?php bp_avatar_to_crop(); ?>" id="avatar-to-crop" class="avatar" alt="<?php esc_attr_e( 'Profile photo to crop', 'buddypress' ); ?>" />
     
    7575<?php else : ?>
    7676
    77     <p class="bp-help-text"><?php _e( 'Your profile photo will be used on your profile and throughout the site. To change your profile photo, please create an account with <a href="https://gravatar.com">Gravatar</a> using the same email address as you used to register with this site.', 'buddypress' ); ?></p>
     77    <p class="bp-help-text"><?php esc_html_e( 'Your profile photo will be used on your profile and throughout the site. To change your profile photo, create an account with <a href="https://gravatar.com">Gravatar</a> using the same email address as you used to register with this site.', 'buddypress' ); ?></p>
    7878
    7979<?php endif; ?>
  • trunk/src/bp-templates/bp-nouveau/buddypress/members/single/profile/change-cover-image.php

    r12082 r12104  
    99?>
    1010
    11 <h2 class="screen-heading change-cover-image-screen"><?php _e( 'Change Cover Image', 'buddypress' ); ?></h2>
     11<h2 class="screen-heading change-cover-image-screen"><?php esc_html_e( 'Change Cover Image', 'buddypress' ); ?></h2>
    1212
    1313<?php bp_nouveau_member_hook( 'before', 'edit_cover_image' ); ?>
     
    1515<p class="info bp-feedback">
    1616    <span class="bp-icon" aria-hidden="true"></span>
    17     <span class="bp-help-text"><?php _e( 'Your Cover Image will be used to customize the header of your profile.', 'buddypress' ); ?></span>
     17    <span class="bp-help-text"><?php esc_html_e( 'Your Cover Image will be used to customize the header of your profile.', 'buddypress' ); ?></span>
    1818</p>
    1919
  • trunk/src/bp-templates/bp-nouveau/buddypress/members/single/profile/edit.php

    r12082 r12104  
    2828                <?php endif; ?>
    2929
    30                 <h3 class="screen-heading profile-group-title edit"><?php printf( __( 'Editing \'%s\' Profile Group', 'buddypress' ), bp_get_the_profile_group_name() ); ?></h3>
     30                <h3 class="screen-heading profile-group-title edit">
     31                    <?php
     32                    printf(
     33                        /* translators: %s = profile field group name */
     34                        __( 'Editing "%s" Profile Group', 'buddypress' ),
     35                        bp_get_the_profile_group_name()
     36                    )
     37                    ?>
     38                </h3>
    3139
    3240                <?php
  • trunk/src/bp-templates/bp-nouveau/buddypress/members/single/profile/profile-loop.php

    r12082 r12104  
    99?>
    1010
    11 <h2 class="screen-heading view-profile-screen"><?php _e( 'View Profile', 'buddypress' ); ?></h2>
     11<h2 class="screen-heading view-profile-screen"><?php esc_html_e( 'View Profile', 'buddypress' ); ?></h2>
    1212
    1313<?php bp_nouveau_xprofile_hook( 'before', 'loop_content' ); ?>
  • trunk/src/bp-templates/bp-nouveau/buddypress/members/single/profile/profile-wp.php

    r12082 r12104  
    1414        <?php
    1515        if ( bp_is_my_profile() ) {
    16             _e( 'My Profile', 'buddypress' );
     16            esc_html_e( 'My Profile', 'buddypress' );
    1717        } else {
    1818            printf(
  • trunk/src/bp-templates/bp-nouveau/buddypress/members/single/settings/capabilities.php

    r12082 r12104  
    1010
    1111<h2 class="screen-heading member-capabilities-screen">
    12     <?php _e( 'Members Capabilities', 'buddypress' ); ?>
     12    <?php esc_html_e( 'Members Capabilities', 'buddypress' ); ?>
    1313</h2>
    1414
     
    1717    <label for="user-spammer">
    1818        <input type="checkbox" name="user-spammer" id="user-spammer" value="1" <?php checked( bp_is_user_spammer( bp_displayed_user_id() ) ); ?> />
    19             <?php _e( 'This user is a spammer.', 'buddypress' ); ?>
     19            <?php esc_html_e( 'This member is a spammer.', 'buddypress' ); ?>
    2020    </label>
    2121
  • trunk/src/bp-templates/bp-nouveau/buddypress/members/single/settings/delete-account.php

    r12082 r12104  
    1010
    1111<h2 class="screen-heading delete-account-screen warn">
    12     <?php _e( 'Delete Account', 'buddypress' ); ?>
     12    <?php esc_html_e( 'Delete Account', 'buddypress' ); ?>
    1313</h2>
    1414
     
    1919    <label id="delete-account-understand" class="warn" for="delete-account-understand">
    2020        <input class="disabled" type="checkbox" name="delete-account-understand" value="1" data-bp-disable-input="#delete-account-button" />
    21         <?php _e( 'I understand the consequences.', 'buddypress' ); ?>
     21        <?php esc_html_e( 'I understand the consequences.', 'buddypress' ); ?>
    2222    </label>
    2323
  • trunk/src/bp-templates/bp-nouveau/buddypress/members/single/settings/general.php

    r12082 r12104  
    2222
    2323        <label for="pwd"><?php _e( 'Current Password <span>(required to update email or change current password)</span>', 'buddypress' ); ?></label>
    24         <input type="password" name="pwd" id="pwd" size="16" value="" class="settings-input small" <?php bp_form_field_attributes( 'password' ); ?>/> &nbsp;<a href="<?php echo esc_url( wp_lostpassword_url() ); ?>"><?php _e( 'Lost your password?', 'buddypress' ); ?></a>
     24        <input type="password" name="pwd" id="pwd" size="16" value="" class="settings-input small" <?php bp_form_field_attributes( 'password' ); ?>/> &nbsp;<a href="<?php echo esc_url( wp_lostpassword_url() ); ?>"><?php esc_html_e( 'Lost your password?', 'buddypress' ); ?></a>
    2525
    2626    <?php endif; ?>
     
    3131    <div class="info bp-feedback">
    3232        <span class="bp-icon" aria-hidden="true"></span>
    33         <p class="text"><?php _e( 'Leave password fields blank for no change', 'buddypress' ); ?></p>
     33        <p class="text"><?php esc_html_e( 'Leave password fields blank for no change', 'buddypress' ); ?></p>
    3434    </div>
    3535
    36     <label for="pass1"><?php _e( 'Add Your New Password', 'buddypress' ); ?></label>
     36    <label for="pass1"><?php esc_html_e( 'Add Your New Password', 'buddypress' ); ?></label>
    3737    <input type="password" name="pass1" id="pass1" size="16" value="" class="settings-input small password-entry" <?php bp_form_field_attributes( 'password' ); ?>/>
    3838
    39     <label for="pass2" class="repeated-pwd"><?php _e( 'Repeat Your New Password', 'buddypress' ); ?></label>
     39    <label for="pass2" class="repeated-pwd"><?php esc_html_e( 'Repeat Your New Password', 'buddypress' ); ?></label>
    4040    <input type="password" name="pass2" id="pass2" size="16" value="" class="settings-input small password-entry-confirm" <?php bp_form_field_attributes( 'password' ); ?>/>
    4141
  • trunk/src/bp-templates/bp-nouveau/buddypress/members/single/settings/profile.php

    r12082 r12104  
    1010
    1111<h2 class="screen-heading profile-settings-screen">
    12     <?php _e( 'Profile Visibility Settings', 'buddypress' ); ?>
     12    <?php esc_html_e( 'Profile Visibility Settings', 'buddypress' ); ?>
    1313</h2>
    1414
    1515<p class="bp-help-text profile-visibility-info">
    16     <?php _e( 'Select who may see your profile details.', 'buddypress' ); ?>
     16    <?php esc_html_e( 'Select who may see your profile details.', 'buddypress' ); ?>
    1717</p>
    1818
     
    3232                        <tr>
    3333                            <th class="title field-group-name"><?php bp_the_profile_group_name(); ?></th>
    34                             <th class="title"><?php _e( 'Visibility', 'buddypress' ); ?></th>
     34                            <th class="title"><?php esc_html_e( 'Visibility', 'buddypress' ); ?></th>
    3535                        </tr>
    3636                    </thead>
  • trunk/src/bp-templates/bp-nouveau/includes/activity/ajax.php

    r12082 r12104  
    453453
    454454    if ( empty( $response ) ) {
    455         wp_send_json_error( array( 'error' => __( 'No items were found.', 'buddypress' ) ) );
     455        wp_send_json_error( array( 'error' => __( 'No activites were found.', 'buddypress' ) ) );
    456456    } else {
    457457        wp_send_json_success( $response );
     
    580580        'feedback' => sprintf(
    581581            '<div class="bp-feedback bp-messages error">%s</div>',
    582             esc_html__( 'There was a problem spamming this item. Please try again.', 'buddypress' )
     582            esc_html__( 'There was a problem marking this activity as spam. Please try again.', 'buddypress' )
    583583        ),
    584584    );
     
    629629    if ( ! empty( $_POST['is_single'] ) ) {
    630630        $response['redirect'] = bp_core_get_user_domain( $activity->user_id );
    631         bp_core_add_message( __( 'The activity item has been marked as spam and is no longer visible.', 'buddypress' ) );
     631        bp_core_add_message( __( 'This activity has been marked as spam and is no longer visible.', 'buddypress' ) );
    632632    }
    633633
  • trunk/src/bp-templates/bp-nouveau/includes/activity/functions.php

    r12082 r12104  
    8585            'avatar_width'  => $width,
    8686            'avatar_height' => $height,
    87             'avatar_alt'    => sprintf( __( 'Profile photo of %s', 'buddypress' ), $user_displayname ),
    88             'user_domain'   => bp_loggedin_user_domain()
     87            'user_domain'   => bp_loggedin_user_domain(),
     88            'avatar_alt'    => sprintf(
     89                /* translators: %s = member name */
     90                __( 'Profile photo of %s', 'buddypress' ),
     91                $user_displayname
     92            ),
    8993        ) );
    9094    }
  • trunk/src/bp-templates/bp-nouveau/includes/activity/template-tags.php

    r12082 r12104  
    312312                'link_text' => sprintf(
    313313                    '<span class="bp-screen-reader-text">%1$s</span>',
    314                     esc_html__( 'View Conversation', 'buddypress' )
     314                    __( 'View Conversation', 'buddypress' )
    315315                ),
    316316            );
     
    340340                    'id'              => 'acomment-comment-' . $activity_id,
    341341                    'class'           => 'button acomment-reply bp-primary-action bp-tooltip',
    342                     'data-bp-tooltip' => __( 'Comment', 'buddypress' ),
     342                    'data-bp-tooltip' => _x( 'Comment', 'button', 'buddypress' ),
    343343                    'aria-expanded'   => 'false',
    344344                ),
    345345                'link_text'  => sprintf(
    346346                    '<span class="bp-screen-reader-text">%1$s</span> <span class="comment-count">%2$s</span>',
    347                     esc_html__( 'Comment', 'buddypress' ),
     347                    _x( 'Comment', 'link', 'buddypress' ),
    348348                    esc_html( bp_activity_get_comment_count() )
    349349                ),
     
    454454                'link_class'      => 'button item-button bp-secondary-action bp-tooltip delete-activity confirm',
    455455                'link_rel'        => 'nofollow',
    456                 'data_bp_tooltip' => __( 'Delete', 'buddypress' ),
    457                 'link_text'       => __( 'Delete', 'buddypress' ),
     456                'data_bp_tooltip' => _x( 'Delete', 'button', 'buddypress' ),
     457                'link_text'       => _x( 'Delete', 'button', 'buddypress' ),
    458458                'link_href'       => bp_get_activity_delete_url(),
    459459            );
     
    499499                'button_attr'       => array(
    500500                    'class'           => 'bp-secondary-action spam-activity confirm button item-button bp-tooltip',
    501                     'id'              =>  'activity_make_spam_' . $activity_id,
    502                     'data-bp-tooltip' =>  __( 'Spam', 'buddypress' ),
     501                    'id'              => 'activity_make_spam_' . $activity_id,
     502                    'data-bp-tooltip' => _x( 'Spam', 'button', 'buddypress' ),
    503503                    ),
    504504                'link_text'  => sprintf(
    505505                    /** @todo: use a specific css rule for this *************************************************************/
    506506                    '<span class="dashicons dashicons-flag" style="color:#a00;vertical-align:baseline;width:18px;height:18px" aria-hidden="true"></span><span class="bp-screen-reader-text">%s</span>',
    507                     esc_html__( 'Spam', 'buddypress' )
     507                    esc_html_x( 'Spam', 'button', 'buddypress' )
    508508                ),
    509509            );
     
    795795                'parent_attr'       => $parent_attr,
    796796                'button_element'    => $button_element,
    797                 'link_text'         => __( 'Reply', 'buddypress' ),
    798                 'button_attr'       =>  array(
     797                'link_text'         => _x( 'Reply', 'link', 'buddypress' ),
     798                'button_attr'       => array(
    799799                    'class' => "acomment-reply bp-primary-action",
    800800                    'id'    => sprintf( 'acomment-reply-%1$s-from-%2$s', $activity_id, $activity_comment_id ),
     
    809809                'parent_attr'       => $parent_attr,
    810810                'button_element'    => $button_element,
    811                 'link_text'         => __( 'Delete', 'buddypress' ),
     811                'link_text'         => _x( 'Delete', 'link', 'buddypress' ),
    812812                'button_attr'       => array(
    813813                    'class' => 'delete acomment-delete confirm bp-secondary-action',
    814814                    'rel'   => 'nofollow',
    815                     ),
     815                ),
    816816            ),
    817817        );
     
    836836                'parent_attr'       => $parent_attr,
    837837                'button_element'    => $button_element,
    838                 'link_text'         => __( 'Spam', 'buddypress' ),
     838                'link_text'         => _x( 'Spam', 'link', 'buddypress' ),
    839839                'button_attr'       => array(
    840840                    'id'     => "activity_make_spam_{$activity_comment_id}",
  • trunk/src/bp-templates/bp-nouveau/includes/activity/widgets.php

    r12082 r12104  
    3333            'bp_latest_activities', array(
    3434                'classname'                   => 'bp-latest-activities buddypress',
    35                 'description'                 => __( 'Display the latest updates of your community having the type(s) of your choice.', 'buddypress' ),
     35                'description'                 => __( 'Display the latest updates of your community having the types of your choice.', 'buddypress' ),
    3636                'customize_selective_refresh' => true,
    3737            )
     
    186186
    187187        <p>
    188             <label for="<?php echo $this->get_field_id( 'max' ); ?>"><?php _e( 'Max amount to display:', 'buddypress' ); ?></label>
     188            <label for="<?php echo $this->get_field_id( 'max' ); ?>"><?php _e( 'Maximum amount to display:', 'buddypress' ); ?></label>
    189189            <input type="number" class="widefat" id="<?php echo $this->get_field_id( 'max' ); ?>" name="<?php echo $this->get_field_name( 'max' ); ?>" value="<?php echo intval( $max ); ?>" step="1" min="1" max="20" />
    190190        </p>
  • trunk/src/bp-templates/bp-nouveau/includes/blogs/functions.php

    r12082 r12104  
    166166    return array_merge( $controls, array(
    167167        'blogs_layout' => array(
    168             'label'      => __( 'Blogs loop:', 'buddypress' ),
     168            'label'      => __( 'Sites loop:', 'buddypress' ),
    169169            'section'    => 'bp_nouveau_loops_layout',
    170170            'settings'   => 'bp_nouveau_appearance[blogs_layout]',
  • trunk/src/bp-templates/bp-nouveau/includes/classes.php

    r12082 r12104  
    4444     */
    4545    public function __construct( $args = array() ) {
    46         if ( empty( $args ) || ! is_array( $args ) ) {
    47             _doing_it_wrong( __( 'You need to use an array containing arrays of parameters.', 'buddypress' ) );
    48             return;
    49         }
    50 
    5146        foreach ( $args as $arg ) {
    5247            $r = wp_parse_args( (array) $arg, array(
     
    198193        parent::__construct(
    199194            'bp_nouveau_sidebar_object_nav_widget',
    200             __( '(BuddyPress) Primary nav', 'buddypress' ),
     195            __( '(BuddyPress) Primary navigation', 'buddypress' ),
    201196            $widget_ops
    202197        );
  • trunk/src/bp-templates/bp-nouveau/includes/customizer-controls.php

    r12082 r12104  
    5656
    5757            if ( $item_nav ) {
    58                 $guide = __( 'Drag each possible group nav items that are listed below into the order you prefer, in some groups some of these nav items might not be active.', 'buddypress' );
     58                $guide = __( 'Drag each possible group navigation items that are listed below into the order you prefer, in some groups some of these navigation items might not be active.', 'buddypress' );
    5959            }
    6060
     
    6363            $item_nav = bp_nouveau_member_customizer_nav();
    6464
    65             $guide = __( 'Drag each possible user nav items that are listed below into the order you prefer.', 'buddypress' );
     65            $guide = __( 'Drag each possible member navigation items that are listed below into the order you prefer.', 'buddypress' );
    6666        }
    6767        ?>
  • trunk/src/bp-templates/bp-nouveau/includes/customizer.php

    r12082 r12104  
    4444        ),
    4545        'bp_nouveau_user_front_page' => array(
    46             'title'       => __( 'User front page', 'buddypress' ),
     46            'title'       => __( 'Member front page', 'buddypress' ),
    4747            'panel'       => 'bp_nouveau_panel',
    4848            'priority'    => 30,
    49             'description' => __( 'Configure the default front page for users.', 'buddypress' ),
     49            'description' => __( 'Configure the default front page for members.', 'buddypress' ),
    5050        ),
    5151        'bp_nouveau_user_primary_nav' => array(
    52             'title'       => __( 'User navigation', 'buddypress' ),
     52            'title'       => __( 'Member navigation', 'buddypress' ),
    5353            'panel'       => 'bp_nouveau_panel',
    5454            'priority'    => 50,
    55             'description' => __( 'Customize the navigation menu for users. In the preview window, navigate to a user to preview your changes.', 'buddypress' ),
     55            'description' => __( 'Customize the navigation menu for members. In the preview window, navigate to a user to preview your changes.', 'buddypress' ),
    5656        ),
    5757        'bp_nouveau_loops_layout' => array(
     
    230230        ),
    231231        'user_front_bio' => array(
    232             'label'      => __( 'Display the biographical info from the user\'s WordPress profile.', 'buddypress' ),
     232            'label'      => __( 'Display the biographical info from the member\'s WordPress profile.', 'buddypress' ),
    233233            'section'    => 'bp_nouveau_user_front_page',
    234234            'settings'   => 'bp_nouveau_appearance[user_front_bio]',
     
    236236        ),
    237237        'user_nav_display' => array(
    238             'label'      => __( 'Display the user navigation vertically.', 'buddypress' ),
     238            'label'      => __( 'Display the member navigation vertically.', 'buddypress' ),
    239239            'section'    => 'bp_nouveau_user_primary_nav',
    240240            'settings'   => 'bp_nouveau_appearance[user_nav_display]',
  • trunk/src/bp-templates/bp-nouveau/includes/functions.php

    r12082 r12104  
    317317    if ( $default_user_front ) {
    318318        $sidebars[] = array(
    319             'name'          => __( 'BuddyPress User\'s Home', 'buddypress' ),
     319            'name'          => __( 'BuddyPress Member\'s Home', 'buddypress' ),
    320320            'id'            => 'sidebar-buddypress-members',
    321321            'description'   => __( 'Add widgets here to appear in the front page of each member of your community.', 'buddypress' ),
     
    921921        'registration-disabled' => array(
    922922            'type'    => 'info',
    923             'message' => __( 'User registration is currently not allowed.', 'buddypress' ),
     923            'message' => __( 'Member registration is currently not allowed.', 'buddypress' ),
    924924            'before'  => 'bp_before_registration_disabled',
    925925            'after'   => 'bp_after_registration_disabled'
     
    10351035        'member-activity-loading' => array(
    10361036            'type'    => 'loading',
    1037             'message' => __( 'Loading the user\'s updates. Please wait.', 'buddypress' ),
     1037            'message' => __( 'Loading the member\'s updates. Please wait.', 'buddypress' ),
    10381038        ),
    10391039        'member-blogs-loading' => array(
    10401040            'type'    => 'loading',
    1041             'message' => __( 'Loading the user\'s blogs. Please wait.', 'buddypress' ),
     1041            'message' => __( 'Loading the member\'s blogs. Please wait.', 'buddypress' ),
    10421042        ),
    10431043        'member-friends-loading' => array(
    10441044            'type'    => 'loading',
    1045             'message' => __( 'Loading the user\'s friends. Please wait.', 'buddypress' ),
     1045            'message' => __( 'Loading the member\'s friends. Please wait.', 'buddypress' ),
    10461046        ),
    10471047        'member-groups-loading' => array(
    10481048            'type'    => 'loading',
    1049             'message' => __( 'Loading the user\'s groups. Please wait.', 'buddypress' ),
     1049            'message' => __( 'Loading the member\'s groups. Please wait.', 'buddypress' ),
    10501050        ),
    10511051        'member-notifications-loading' => array(
  • trunk/src/bp-templates/bp-nouveau/includes/groups/ajax.php

    r12082 r12104  
    102102                    'feedback' => sprintf(
    103103                        '<div class="bp-feedback error"><span class="bp-icon" aria-hidden="true"></span><p>%s</p></div>',
    104                         esc_html__( 'Group invite could not be accepted.', 'buddypress' )
     104                        esc_html__( 'Group invitation could not be accepted.', 'buddypress' )
    105105                    ),
    106106                    'type'     => 'error',
     
    283283
    284284    $bp->groups->invites_scope = 'members';
    285     $message = __( 'Select members to invite by clicking the + button. Once you\'ve made your selection, use the "Send Invites" nav item to continue.', 'buddypress' );
     285    $message = __( 'Select members to invite by clicking the + button. Once you\'ve made your selection, use the "Send Invites" navigation item to continue.', 'buddypress' );
    286286
    287287    if ( 'friends' === $request['scope'] ) {
    288288        $request['user_id'] = bp_loggedin_user_id();
    289289        $bp->groups->invites_scope = 'friends';
    290         $message = __( 'Select friends to invite by clicking the + button. Once you\'ve made your selection, use the "Send Invites" nav item to continue.', 'buddypress' );
     290        $message = __( 'Select friends to invite by clicking the + button. Once you\'ve made your selection, use the "Send Invites" navigation item to continue.', 'buddypress' );
    291291    }
    292292
     
    295295        if ( ! bp_group_has_invites( array( 'user_id' => 'any' ) ) ) {
    296296            wp_send_json_error( array(
    297                 'feedback' => __( 'No pending invites found.', 'buddypress' ),
     297                'feedback' => __( 'No pending group invitations found.', 'buddypress' ),
    298298                'type'     => 'info',
    299299            ) );
     
    302302        $request['is_confirmed'] = false;
    303303        $bp->groups->invites_scope = 'invited';
    304         $message = __( 'You can view all the group\'s pending invites from this screen.', 'buddypress' );
     304        $message = __( 'You can view the group\'s pending invitations from this screen.', 'buddypress' );
    305305    }
    306306
     
    366366
    367367    if ( ! bp_groups_user_can_send_invites( $group_id ) ) {
    368         $response['feedback'] = __( 'You are not allowed to send invites for this group.', 'buddypress' );
     368        $response['feedback'] = __( 'You are not allowed to send invitations for this group.', 'buddypress' );
    369369        wp_send_json_error( $response );
    370370    }
     
    405405
    406406        $error_count   = count( $errors );
    407         $error_message = sprintf( _n( 'Invites failed for %s user.', 'Invites failed for %s users.', $error_count, 'buddypress' ), number_format_i18n( $error_count ) );
     407        $error_message = sprintf(
     408            /* translators: count of users affected */
     409            _n(
     410                'Invitation failed for %s user.',
     411                'Invitation failed for %s users.',
     412                $error_count, 'buddypress'
     413            ),
     414            number_format_i18n( $error_count )
     415        );
    408416
    409417        wp_send_json_error(
     
    418426    wp_send_json_success(
    419427        array(
    420             'feedback' => __( 'Invites sent.', 'buddypress' ),
     428            'feedback' => __( 'Invitations sent.', 'buddypress' ),
    421429            'type'     => 'success',
    422430        )
     
    428436 */
    429437function bp_nouveau_ajax_remove_group_invite() {
    430     $user_id  = $_POST['user'];
     438    $user_id  = (int) $_POST['user'];
    431439    $group_id = bp_get_current_group_id();
    432440
     
    435443        wp_send_json_error(
    436444            array(
    437                 'feedback' => __( 'Invites could not be removed. Please try again.', 'buddypress' ),
     445                'feedback' => __( 'Group invitation could not be removed.', 'buddypress' ),
    438446                'type'     => 'error',
    439447            )
     
    444452        wp_send_json_error(
    445453            array(
    446                 'feedback' => __( 'Too late! The user is already a member of the group.', 'buddypress' ),
     454                'feedback' => __( 'The member is already a member of the group.', 'buddypress' ),
    447455                'type'     => 'warning',
    448456                'code'     => 1,
     
    455463        wp_send_json_error(
    456464            array(
    457                 'feedback' => __( 'Invite could not be removed successfully.', 'buddypress' ),
     465                'feedback' => __( 'Group invitation could not be removed.', 'buddypress' ),
    458466                'type'     => 'error',
    459467                'code'     => 0,
     
    464472    wp_send_json_success(
    465473        array(
    466             'feedback'    => __( 'No more pending invites for the group.', 'buddypress' ),
     474            'feedback'    => __( 'There are no more pending invitations for the group.', 'buddypress' ),
    467475            'type'        => 'info',
    468476            'has_invites' => bp_group_has_invites( array( 'user_id' => 'any' ) ),
  • trunk/src/bp-templates/bp-nouveau/includes/groups/functions.php

    r12082 r12104  
    2525    }
    2626
    27     $message = '<div class="bp-feedback ' . $type . '"><span class="bp-icon" aria-hidden="true"></span><p>' . $message . '</p></div>';
     27    $message = '<div class=" ' . esc_attr( "bp-feedback {$type}" ) . '"><span class="bp-icon" aria-hidden="true"></span><p>' . esc_html( $message ) . '</p></div>';
    2828
    2929    return $message;
     
    150150        'loading'            => __( 'Loading members. Please wait.', 'buddypress' ),
    151151        'invites_form'       => __( 'Use the "Send" button to send your invite or the "Cancel" button to abort.', 'buddypress' ),
    152         'invites_form_reset' => __( 'Invites cleared. Please use one of the available tabs to select members to invite.', 'buddypress' ),
    153         'invites_sending'    => __( 'Sending the invites. Please wait.', 'buddypress' ),
    154         'removeUserInvite'   => __( 'Disinvite %s', 'buddypress' ),
     152        'invites_form_reset' => __( 'Group invitations cleared. Please use one of the available tabs to select members to invite.', 'buddypress' ),
     153        'invites_sending'    => __( 'Sending group invitations. Please wait.', 'buddypress' ),
     154        'removeUserInvite'   => __( 'Cancel invitation %s', 'buddypress' ),
    155155        'group_id'           => ! bp_get_current_group_id() ? bp_get_new_group_id() : bp_get_current_group_id(),
    156156        'is_group_create'    => bp_is_group_create(),
     
    295295/**
    296296 * @since 3.0.0
    297  * @todo I don't see any reason why to restrict group invites to friends..
    298297 */
    299298function bp_nouveau_group_invites_create_steps( $steps = array() ) {
    300299    if ( bp_is_active( 'friends' ) && isset( $steps['group-invites'] ) ) {
    301300        // Simply change the name
    302         $steps['group-invites']['name'] = _x( 'Invite', 'Group screen nav', 'buddypress' );
     301        $steps['group-invites']['name'] = _x( 'Invite', 'Group invitations menu title', 'buddypress' );
    303302        return $steps;
    304303    }
     
    306305    // Add the create step if friends component is not active
    307306    $steps['group-invites'] = array(
    308         'name'     => _x( 'Invite', 'Group screen nav', 'buddypress' ),
     307        'name'     => _x( 'Invite', 'Group invitations menu title', 'buddypress' ),
    309308        'position' => 30,
    310309    );
     
    326325
    327326        $bp->groups->nav->edit_nav(
    328             array( 'name' => _x( 'Invite', 'My Group screen nav', 'buddypress' ) ),
     327            array( 'name' => _x( 'Invite', 'Group invitations menu title', 'buddypress' ) ),
    329328            'send-invites',
    330329            bp_get_current_group_slug()
     
    337336
    338337        bp_core_new_subnav_item( array(
    339             'name'            => _x( 'Invite', 'My Group screen nav', 'buddypress' ),
     338            'name'            => _x( 'Invite', 'Group invitations menu title', 'buddypress' ),
    340339            'slug'            => 'send-invites',
    341340            'parent_url'      => $group_link,
     
    395394        'avatar_url'  => $item_avatar_url,
    396395        'object_type' => 'group',
    397         'is_public'   => 'public' === $item->status,
     396        'is_public'   => ( 'public' === $item->status ),
    398397    );
    399398}
     
    413412
    414413    bp_core_new_subnav_item( array(
    415         'name'            => _x( 'Group Invites', 'My Group Invites settings screen nav', 'buddypress' ),
     414        'name'            => _x( 'Group Invites', 'Group invitations main menu title', 'buddypress' ),
    416415        'slug'            => 'invites',
    417416        'parent_url'      => trailingslashit( $user_domain . $slug ),
     
    441440        'parent' => 'my-account-' . buddypress()->settings->id,
    442441        'id'     => 'my-account-' . buddypress()->settings->id . '-invites',
    443         'title'  => _x( 'Group Invites', 'My Account Settings sub nav', 'buddypress' ),
     442        'title'  => _x( 'Group Invites', 'Group invitations main menu title', 'buddypress' ),
    444443        'href'   => trailingslashit( $settings_link . 'invites/' ),
    445444    );
     
    694693            'panel'       => 'bp_nouveau_panel',
    695694            'priority'    => 40,
    696             'description' => __( 'Customize the navigation menu for groups. See your changes by navigating to a group in the live-preview window..', 'buddypress' ),
     695            'description' => __( 'Customize the navigation menu for groups. See your changes by navigating to a group in the live-preview window.', 'buddypress' ),
    697696        ),
    698697    ) );
     
    801800        ),
    802801        'group_front_boxes' => array(
    803             'label'      => __( 'Enable widget region for group homepages. (When enabled, the site admin can add widgets to group pages via the Widgets panel.)', 'buddypress' ),
     802            'label'      => __( 'Enable widget region for group homepages. When enabled, the site admin can add widgets to group pages via the Widgets panel.', 'buddypress' ),
    804803            'section'    => 'bp_nouveau_group_front_page',
    805804            'settings'   => 'bp_nouveau_appearance[group_front_boxes]',
     
    807806        ),
    808807        'group_front_description' => array(
    809             'label'      => __( 'Display the group description in the body of the group\'s front page.', 'buddypress' ),
     808            'label'      => __( "Display the group description in the body of the group's front page.", 'buddypress' ),
    810809            'section'    => 'bp_nouveau_group_front_page',
    811810            'settings'   => 'bp_nouveau_appearance[group_front_description]',
     
    819818        ),
    820819        'group_nav_tabs' => array(
    821             'label'      => __( 'Use tab styling for primary nav.', 'buddypress' ),
     820            'label'      => __( 'Use tab styling for primary navigation.', 'buddypress' ),
    822821            'section'    => 'bp_nouveau_group_primary_nav',
    823822            'settings'   => 'bp_nouveau_appearance[group_nav_tabs]',
     
    825824        ),
    826825        'group_subnav_tabs' => array(
    827             'label'      => __( 'Use tab styling for secondary nav.', 'buddypress' ),
     826            'label'      => __( 'Use tab styling for secondary navigation.', 'buddypress' ),
    828827            'section'    => 'bp_nouveau_group_primary_nav',
    829828            'settings'   => 'bp_nouveau_appearance[group_subnav_tabs]',
     
    844843        ),
    845844        'groups_layout' => array(
    846             'label'      => __( 'Groups', 'buddypress' ),
     845            'label'      => _x( 'Groups', 'Customizer control label', 'buddypress' ),
    847846            'section'    => 'bp_nouveau_loops_layout',
    848847            'settings'   => 'bp_nouveau_appearance[groups_layout]',
     
    955954    // Loop in the hierarchy to fill it for the requested template part
    956955    foreach ( $bp_nouveau->groups->current_group_hierarchy as $part ) {
    957         $templates[] = sprintf( $part, $template );
     956        $templates[] = sprintf( $part, sanitize_file_name( $template ) );
    958957    }
    959958
     
    10101009 */
    10111010function bp_nouveau_group_is_home_widgets() {
    1012     return true === bp_nouveau()->groups->is_group_home_sidebar;
     1011    return ( true === bp_nouveau()->groups->is_group_home_sidebar );
    10131012}
    10141013
     
    11981197        array(
    11991198            'id'       => 'member_promoted_to_admin',
    1200             'label'    => __( 'Group Admin promotions', 'buddypress' ),
     1199            'label'    => __( 'Group Administrator promotions', 'buddypress' ),
    12011200            'position' => 85,
    12021201        ),
     
    12081207        array(
    12091208            'id'       => 'group_invite',
    1210             'label'    => __( 'Group invites', 'buddypress' ),
     1209            'label'    => __( 'Group invitations', 'buddypress' ),
    12111210            'position' => 105,
    12121211        ),
  • trunk/src/bp-templates/bp-nouveau/includes/members/functions.php

    r12082 r12104  
    356356 */
    357357function bp_nouveau_member_is_home_widgets() {
    358     return true === bp_nouveau()->members->is_user_home_sidebar;
     358    return ( true === bp_nouveau()->members->is_user_home_sidebar );
    359359}
    360360
  • trunk/src/bp-templates/bp-nouveau/includes/members/template-tags.php

    r12092 r12104  
    287287                        'must_be_logged_in' => true,
    288288                        'parent_element'    => $parent_element,
    289                         'link_text'         => __( 'Accept', 'buddypress' ),
     289                        'link_text'         => _x( 'Accept', 'button', 'buddypress' ),
    290290                        'parent_attr'       => array(
    291291                            'id'    => '',
     
    303303                        'must_be_logged_in' => true,
    304304                        'parent_element'    => $parent_element,
    305                         'link_text'         => __( 'Reject', 'buddypress' ),
     305                        'link_text'         => _x( 'Reject', 'button', 'buddypress' ),
    306306                        'parent_attr'       => array(
    307307                            'id'    => '',
  • trunk/src/bp-templates/bp-nouveau/includes/messages/ajax.php

    r12082 r12104  
    436436function bp_nouveau_ajax_delete_thread_messages() {
    437437    $response = array(
    438         'feedback' => __( 'There was a problem deleting your message(s). Please try again.', 'buddypress' ),
     438        'feedback' => __( 'There was a problem deleting your messages. Please try again.', 'buddypress' ),
    439439        'type'     => 'error',
    440440    );
     
    459459
    460460    wp_send_json_success( array(
    461         'feedback' => __( 'Message(s) deleted', 'buddypress' ),
     461        'feedback' => __( 'Messages deleted', 'buddypress' ),
    462462        'type'     => 'success',
    463463    ) );
     
    475475
    476476    if ( 'star' === $action ) {
    477         $error_message = __( 'There was a problem starring your message(s). Please try again.', 'buddypress' );
     477        $error_message = __( 'There was a problem starring your messages. Please try again.', 'buddypress' );
    478478    } else {
    479         $error_message = __( 'There was a problem unstarring your message(s). Please try agian.', 'buddypress' );
     479        $error_message = __( 'There was a problem unstarring your messages. Please try agian.', 'buddypress' );
    480480    }
    481481
     
    551551
    552552    if ( 'star' === $action ) {
    553         $success_message = __( 'Message(s) successfully starred.', 'buddypress' );
     553        $success_message = __( 'Messages successfully starred.', 'buddypress' );
    554554    } else {
    555         $success_message = __( 'Message(s) successfully unstarred.', 'buddypress' );
     555        $success_message = __( 'Messages successfully unstarred.', 'buddypress' );
    556556    }
    557557
     
    574574
    575575    $response = array(
    576         'feedback' => __( 'There was a problem marking your message(s) as read. Please try again.', 'buddypress' ),
     576        'feedback' => __( 'There was a problem marking your messages as read. Please try again.', 'buddypress' ),
    577577        'type'     => 'error',
    578578    );
     
    580580    if ( 'unread' === $action ) {
    581581        $response = array(
    582             'feedback' => __( 'There was a problem marking your message(s) as unread. Please try again.', 'buddypress' ),
     582            'feedback' => __( 'There was a problem marking your messages as unread. Please try again.', 'buddypress' ),
    583583            'type'     => 'error',
    584584        );
     
    598598
    599599    if ( 'unread' === $action ) {
    600         $response['feedback'] = __( 'Message(s) marked as unread.', 'buddypress' );
     600        $response['feedback'] = __( 'Messages marked as unread.', 'buddypress' );
    601601    } else {
    602         $response['feedback'] = __( 'Message(s) marked as read.', 'buddypress' );
     602        $response['feedback'] = __( 'Messages marked as read.', 'buddypress' );
    603603    }
    604604
  • trunk/src/bp-templates/bp-nouveau/includes/messages/functions.php

    r12082 r12104  
    102102        'loading'       => __( 'Loading messages. Please wait.', 'buddypress' ),
    103103        'doingAction'   => array(
    104             'read'   => __( 'Marking message(s) as read. Please wait.', 'buddypress' ),
    105             'unread' => __( 'Marking message(s) as unread. Please wait.', 'buddypress' ),
    106             'delete' => __( 'Deleting message(s). Please wait.', 'buddypress' ),
    107             'star'   => __( 'Starring message(s). Please wait.', 'buddypress' ),
    108             'unstar' => __( 'Unstarring message(s). Please wait.', 'buddypress' ),
     104            'read'   => __( 'Marking messages as read. Please wait.', 'buddypress' ),
     105            'unread' => __( 'Marking messages as unread. Please wait.', 'buddypress' ),
     106            'delete' => __( 'Deleting messages. Please wait.', 'buddypress' ),
     107            'star'   => __( 'Starring messages. Please wait.', 'buddypress' ),
     108            'unstar' => __( 'Unstarring messages. Please wait.', 'buddypress' ),
    109109        ),
    110110        'bulk_actions'  => bp_nouveau_messages_get_bulk_actions(),
     
    146146    $search_form_html = '<form action="" method="get" id="search-messages-form">
    147147        <label for="messages_search"><input type="text" name="' . esc_attr( $query_arg ) . '" id="messages_search" placeholder="' . esc_attr( $placeholder ) . '" /></label>
    148         <input type="submit" id="messages_search_submit" name="messages_search_submit" value="' . esc_attr_e( 'Search', 'buddypress' ) . '" />
     148        <input type="submit" id="messages_search_submit" name="messages_search_submit" value="' . esc_attr_x( 'Search', 'button', 'buddypress' ) . '" />
    149149    </form>';
    150150
     
    261261
    262262    return array(
    263         'text' => esc_html__( 'New sitewide notice', 'buddypress' ),
     263        'text' => __( 'New sitewide notice', 'buddypress' ),
    264264        'link' => bp_loggedin_user_domain(),
    265265    );
  • trunk/src/bp-templates/bp-nouveau/includes/notifications/functions.php

    r12082 r12104  
    201201 * @since 3.0.0
    202202 *
    203  * @param  string $link The Mark Unread action link.
    204  * @return string       Link Output.
     203 * @param string $link Optional. The Mark Unread action link.
     204 *
     205 * @return string Link Output.
    205206 */
    206207function bp_nouveau_notifications_mark_unread_link( $link = '' ) {
    207     return bp_nouveau_notifications_dashiconified_link( $link, __( 'Mark Unread', 'buddypress' ), 'dashicons-hidden' );
     208    return bp_nouveau_notifications_dashiconified_link(
     209        $link,
     210        _x( 'Mark Unread', 'link', 'buddypress' ),
     211        'dashicons-hidden'
     212    );
    208213}
    209214
     
    213218 * @since 3.0.0
    214219 *
    215  * @param  string $link The Mark Read action link.
    216  * @return string       Link Output.
     220 * @param string $link Optional. The Mark Read action link.
     221 *
     222 * @return string Link Output.
    217223 */
    218224function bp_nouveau_notifications_mark_read_link( $link = '' ) {
    219     return bp_nouveau_notifications_dashiconified_link( $link, __( 'Mark Read', 'buddypress' ), 'dashicons-visibility' );
     225    return bp_nouveau_notifications_dashiconified_link(
     226        $link,
     227        _x( 'Mark Read', 'link', 'buddypress' ),
     228        'dashicons-visibility'
     229    );
    220230}
    221231
     
    225235 * @since 3.0.0
    226236 *
    227  * @param  string $link The Delete action link.
    228  * @return string       Link Output.
     237 * @param string $link Optional. The Delete action link.
     238 *
     239 * @return string Link Output.
    229240 */
    230241function bp_nouveau_notifications_delete_link( $link = '' ) {
    231     return bp_nouveau_notifications_dashiconified_link( $link, __( 'Delete', 'buddypress' ), 'dashicons-dismiss' );
    232 }
     242    return bp_nouveau_notifications_dashiconified_link(
     243        $link,
     244        _x( 'Delete', 'link', 'buddypress' ),
     245        'dashicons-dismiss'
     246    );
     247}
  • trunk/src/bp-templates/bp-nouveau/includes/notifications/template-tags.php

    r12082 r12104  
    8484    <span class="notifications-order-actions">
    8585        <a href="<?php echo esc_url( $desc ); ?>" class="bp-tooltip" data-bp-tooltip="<?php esc_attr_e( 'Newest First', 'buddypress' ); ?>" aria-label="<?php esc_attr_e( 'Newest First', 'buddypress' ); ?>" data-bp-notifications-order="DESC"><span class="dashicons dashicons-arrow-down" aria-hidden="true"></span></a>
    86         <a href="<?php echo esc_url( $asc ); ?>" class="bp-tooltip" data-bp-tooltip="<?php esc_attr_e( 'Older First', 'buddypress' ); ?>" aria-label="<?php esc_attr_e( 'Older First', 'buddypress' ); ?>" data-bp-notifications-order="ASC"><span class="dashicons dashicons-arrow-up" aria-hidden="true"></span></a>
     86        <a href="<?php echo esc_url( $asc ); ?>" class="bp-tooltip" data-bp-tooltip="<?php esc_attr_e( 'Oldest First', 'buddypress' ); ?>" aria-label="<?php esc_attr_e( 'Oldest First', 'buddypress' ); ?>" data-bp-notifications-order="ASC"><span class="dashicons dashicons-arrow-up" aria-hidden="true"></span></a>
    8787    </span>
    8888
     
    101101
    102102        <label class="bp-screen-reader-text" for="notification-select"><?php
    103             /* translators: accessibility text */
    104             _e( 'Select Bulk Action', 'buddypress' );
     103            esc_html_e( 'Select Bulk Action', 'buddypress' );
    105104        ?></label>
    106105
    107106        <select name="notification_bulk_action" id="notification-select">
    108             <option value="" selected="selected"><?php _e( 'Bulk Actions', 'buddypress' ); ?></option>
     107            <option value="" selected="selected"><?php echo esc_html( 'Bulk Actions', 'buddypress' ); ?></option>
    109108
    110109            <?php if ( bp_is_current_action( 'unread' ) ) : ?>
    111                 <option value="read"><?php _e( 'Mark read', 'buddypress' ); ?></option>
     110                <option value="read"><?php echo esc_html_x( 'Mark read', 'button', 'buddypress' ); ?></option>
    112111            <?php elseif ( bp_is_current_action( 'read' ) ) : ?>
    113                 <option value="unread"><?php _e( 'Mark unread', 'buddypress' ); ?></option>
     112                <option value="unread"><?php echo esc_html_x( 'Mark unread', 'button', 'buddypress' ); ?></option>
    114113            <?php endif; ?>
    115             <option value="delete"><?php _e( 'Delete', 'buddypress' ); ?></option>
     114            <option value="delete"><?php echo esc_html_x( 'Delete', 'button', 'buddypress' ); ?></option>
    116115        </select>
    117116
     
    120119    </div><!-- // .select-wrap -->
    121120
    122     <input type="submit" id="notification-bulk-manage" class="button action" value="<?php esc_attr_e( 'Apply', 'buddypress' ); ?>">
     121    <input type="submit" id="notification-bulk-manage" class="button action" value="<?php echo esc_attr_x( 'Apply', 'button', 'buddypress' ); ?>">
    123122    <?php
    124123}
  • trunk/src/bp-templates/bp-nouveau/includes/template-tags.php

    r12082 r12104  
    22422242
    22432243    foreach ( $fields as $name => $attributes ) {
    2244         $classes = '';
    2245 
    22462244        list( $label, $required, $value, $attribute_type, $type, $class ) = array_values( $attributes );
    2247 
    2248         if ( $required ) {
    2249             $required = ' ' . _x( '(required)', 'signup required field', 'buddypress' );
    2250         }
    22512245
    22522246        // Text fields are using strings, radios are using their inputs
    22532247        $label_output = '<label for="%1$s">%2$s</label>';
    22542248        $id           = $name;
     2249        $classes      = '';
     2250
     2251        if ( $required ) {
     2252            /* translators: Do not translate placeholders. 2 = form field name, 3 = "(required)". */
     2253            $label_output = __( '<label for="%1$s">%2$s %3$s</label>', 'buddypress' );
     2254        }
    22552255
    22562256        // Output the label for regular fields
    22572257        if ( 'radio' !== $type ) {
    2258             printf( $label_output, esc_attr( $name ), esc_html( sprintf( $label, $required ) ) );
     2258            if ( $required ) {
     2259                printf( $label_output, esc_attr( $name ), esc_html( $label ), __( '(required)', 'buddypress' ) );
     2260            } else {
     2261                printf( $label_output, esc_attr( $name ), esc_html( $label ) );
     2262            }
    22592263
    22602264            if ( ! empty( $value ) && is_callable( $value ) ) {
Note: See TracChangeset for help on using the changeset viewer.