Changeset 12104
- Timestamp:
- 05/21/2018 01:00:36 AM (7 years ago)
- 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 16 16 17 17 <?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> 22 19 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> 24 31 25 32 <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> 27 34 <textarea name="group-request-membership-comments" id="group-request-membership-comments"></textarea> 28 35 … … 36 43 do_action( 'bp_group_request_membership_content' ); ?> 37 44 38 <p><input type="submit" name="group-request-send" id="group-request-send" value="<?php e sc_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' ); ?>" /> 39 46 40 47 <?php wp_nonce_field( 'groups_request_membership' ); ?> -
trunk/src/bp-templates/bp-nouveau/buddypress/activity/activity-loop.php
r12082 r12104 26 26 27 27 <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> 29 29 </li> 30 30 -
trunk/src/bp-templates/bp-nouveau/buddypress/activity/comment-form.php
r12082 r12104 16 16 <div class="ac-reply-content"> 17 17 <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> 19 21 <textarea id="ac-input-<?php bp_activity_id(); ?>" class="ac-input bp-suggestions" name="ac_input_<?php bp_activity_id(); ?>"></textarea> 20 22 </div> 21 <input type="submit" name="ac_form_submit" value="<?php esc_attr_e( 'Post', 'buddypress' ); ?>" /> <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" /> <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 ?> 22 30 <input type="hidden" name="comment_form_id" value="<?php bp_activity_id(); ?>" /> 23 31 </div> -
trunk/src/bp-templates/bp-nouveau/buddypress/activity/post-form.php
r12082 r12104 9 9 10 10 <?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. 14 13 */ 15 14 bp_nouveau_before_activity_post_form(); 16 15 ?> 17 16 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> 19 18 20 19 <div id="bp-nouveau-activity-form" class="activity-update-form"></div> 21 20 22 21 <?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. 26 24 */ 27 bp_nouveau_after_activity_post_form(); ?>25 bp_nouveau_after_activity_post_form(); -
trunk/src/bp-templates/bp-nouveau/buddypress/assets/_attachments/avatars/camera.php
r12082 r12104 20 20 <div id="avatar-crop-pane" class="avatar" style="width:{{data.w}}px; height:{{data.h}}px"></div> 21 21 <div id="avatar-crop-actions"> 22 <button type="button" class="button avatar-webcam-capture"><?php e sc_html_e( 'Capture', 'buddypress' ); ?></button>23 <button type="button" class="button avatar-webcam-save"><?php e sc_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> 24 24 </div> 25 25 </div> -
trunk/src/bp-templates/bp-nouveau/buddypress/assets/_attachments/avatars/crop.php
r12082 r12104 19 19 </div> 20 20 <div id="avatar-crop-actions"> 21 <button type="button" class="button avatar-crop-submit"><?php e sc_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> 22 22 </div> 23 23 </div> -
trunk/src/bp-templates/bp-nouveau/buddypress/assets/_attachments/avatars/index.php
r12082 r12104 33 33 <script id="tmpl-bp-avatar-delete" type="text/html"> 34 34 <# if ( 'user' === data.object ) { #> 35 <p><?php _e( "If you'd like to delete your current profile photo but not upload a new one, pleaseuse 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> 36 36 <button type="button" class="button edit" id="bp-delete-avatar"><?php esc_html_e( 'Delete My Profile Photo', 'buddypress' ); ?></button> 37 37 <# } else if ( 'group' === data.object ) { #> -
trunk/src/bp-templates/bp-nouveau/buddypress/assets/_attachments/cover-images/index.php
r12082 r12104 22 22 <script id="tmpl-bp-cover-image-delete" type="text/html"> 23 23 <# 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> 26 30 <# } 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> 29 37 <# } else { #> 30 38 <?php -
trunk/src/bp-templates/bp-nouveau/buddypress/assets/_attachments/uploader.php
r12082 r12104 20 20 <div class="drag-drop-inside"> 21 21 <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> 24 29 </div> 25 30 </div> -
trunk/src/bp-templates/bp-nouveau/buddypress/assets/emails/single-bp-email.php
r12082 r12104 218 218 <span class="footer_text"><?php echo nl2br( stripslashes( $settings['footer_text'] ) ); ?></span> 219 219 <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> 221 221 222 222 <?php -
trunk/src/bp-templates/bp-nouveau/buddypress/common/js-templates/activity/form.php
r12082 r12104 40 40 <# if ( data.selected ) { #> 41 41 <button type="button" class="bp-remove-item dashicons dashicons-no" data-item_id="{{data.id}}"> 42 <span class="bp-screen-reader-text"><?php e sc_html_e( 'Remove item', 'buddypress' ); ?></span>42 <span class="bp-screen-reader-text"><?php echo esc_html_x( 'Remove item', 'button', 'buddypress' ); ?></span> 43 43 </button> 44 44 <# } #> -
trunk/src/bp-templates/bp-nouveau/buddypress/common/js-templates/invites/index.php
r12082 r12104 84 84 <div class="action"> 85 85 <# 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' ); ?><# } #>"> 87 87 <span class="icons" aria-hidden="true"></span> 88 88 <span class="bp-screen-reader-text"> 89 89 <# if ( data.selected ) { #> 90 <?php e sc_html_e( 'Disinvite', 'buddypress' ); ?>90 <?php echo esc_html_x( 'Cancel invitation', 'button', 'buddypress' ); ?> 91 91 <# } else { #> 92 <?php e sc_html_e( 'Invite', 'buddypress' ); ?>92 <?php echo esc_html_x( 'Invite', 'button', 'buddypress' ); ?> 93 93 <# } #> 94 94 </span> … … 97 97 98 98 <# 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 e sc_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' ); ?>"> 100 100 <span class=" icons" aria-hidden="true"></span> 101 <span class="bp-screen-reader-text"><?php e sc_html_e( 'Disinvite', 'buddypress' ); ?></span>101 <span class="bp-screen-reader-text"><?php echo esc_attr_x( 'Cancel invitation', 'button', 'buddypress' ); ?></span> 102 102 </button> 103 103 <# } #> … … 114 114 <script type="text/html" id="tmpl-bp-invites-form"> 115 115 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> 117 117 <textarea id="send-invites-control" class="bp-faux-placeholder-label"></textarea> 118 118 119 119 <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> 122 122 </div> 123 123 </script> … … 127 127 <div class="bp-search"> 128 128 <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 e sc_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' ); ?>"/> 131 131 132 132 <button type="submit" id="group_invites_search_submit" class="nouveau-search-submit"> 133 133 <span class="dashicons dashicons-search" aria-hidden="true"></span> 134 <span id="button-text" class="bp-screen-reader-text"><?php e sc_html_e( 'Search', 'buddypress' ); ?></span>134 <span id="button-text" class="bp-screen-reader-text"><?php echo esc_html_x( 'Search', 'button', 'buddypress' ); ?></span> 135 135 </button> 136 136 </form> … … 141 141 <script type="text/html" id="tmpl-bp-invites-paginate"> 142 142 <# if ( 1 !== data.page ) { #> 143 <a href="#previous-page" id="bp-invites-prev-page" class="button invite-button bp-tooltip" data-bp-tooltip="<?php e sc_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' ); ?>"> 144 144 <span class="dashicons dashicons-arrow-left" aria-hidden="true"></span> 145 <span class="bp-screen-reader-text"><?php e sc_html_e( 'Previous page', 'buddypress' ); ?></span>145 <span class="bp-screen-reader-text"><?php echo esc_html_x( 'Previous page', 'link', 'buddypress' ); ?></span> 146 146 </a> 147 147 <# } #> 148 148 149 149 <# 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 e sc_attr_e( 'Next page', 'buddypress' ); ?>">151 <span class="bp-screen-reader-text"><?php e sc_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> 152 152 <span class="dashicons dashicons-arrow-right" aria-hidden="true"></span> 153 153 </button> -
trunk/src/bp-templates/bp-nouveau/buddypress/common/js-templates/messages/index.php
r12082 r12104 36 36 37 37 <div class="submit"> 38 <input type="button" id="bp-messages-send" class="button bp-primary-action" value="<?php e sc_attr_e( 'Send', 'buddypress' ); ?>"/>39 <input type="button" id="bp-messages-reset" class="text-button small bp-secondary-action" value="<?php e sc_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' ); ?>"/> 40 40 </div> 41 41 </script> … … 60 60 ) 61 61 ); 62 62 63 // Remove the temporary filter on editor buttons 63 64 remove_filter( 'mce_buttons', 'bp_nouveau_messages_mce_buttons', 10, 1 ); … … 69 70 <button id="bp-messages-prev-page"class="button messages-button"> 70 71 <span class="dashicons dashicons-arrow-left"></span> 71 <span class="bp-screen-reader-text"><?php e sc_html_e( 'Prev', 'buddypress' ); ?></span>72 <span class="bp-screen-reader-text"><?php echo esc_html_x( 'Previous page', 'link', 'buddypress' ); ?></span> 72 73 </button> 73 74 <# } #> … … 76 77 <button id="bp-messages-next-page"class="button messages-button"> 77 78 <span class="dashicons dashicons-arrow-right"></span> 78 <span class="bp-screen-reader-text"><?php e sc_html_e( 'Next', 'buddypress' ); ?></span>79 <span class="bp-screen-reader-text"><?php echo esc_html_x( 'Next page', 'link', 'buddypress' ); ?></span> 79 80 </button> 80 81 <# } #> … … 88 89 <?php _e( 'Search Messages', 'buddypress' ); ?> 89 90 </label> 90 <input type="search" id="user_messages_search" placeholder="<?php e sc_attr_e( 'Search', 'buddypress' ); ?>"/>91 <input type="search" id="user_messages_search" placeholder="<?php echo esc_attr_x( 'Search', 'search placeholder text', 'buddypress' ); ?>"/> 91 92 <button type="submit" id="user_messages_search_submit"> 92 93 <span class="dashicons dashicons-search" aria-hidden="true"></span> 93 <span class="bp-screen-reader-text"><?php e sc_html_e( 'Search', 'buddypress' ); ?></span>94 <span class="bp-screen-reader-text"><?php echo esc_html_x( 'Search', 'button', 'buddypress' ); ?></span> 94 95 </button> 95 96 </form> … … 114 115 <span class="select-arrow" aria-hidden="true"></span> 115 116 </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' ); ?>"> 117 118 <span class="dashicons dashicons-yes" aria-hidden="true"></span> 118 <span class="bp-screen-reader-text"><?php e sc_html_e( 'Apply', 'buddypress' ); ?></span>119 <span class="bp-screen-reader-text"><?php echo esc_html_x( 'Apply', 'button', 'buddypress' ); ?></span> 119 120 </button> 120 121 </div> … … 302 303 <?php bp_loggedin_user_avatar( 'type=thumb&height=30&width=30' ); ?> 303 304 304 <strong><?php _e( 'Send a Reply', 'buddypress' ); ?></strong>305 <strong><?php esc_html_e( 'Send a Reply', 'buddypress' ); ?></strong> 305 306 </div> 306 307 … … 319 320 320 321 <div class="submit"> 321 <input type="submit" name="send" value="<?php e sc_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"/> 322 323 </div> 323 324 -
trunk/src/bp-templates/bp-nouveau/buddypress/common/notices/template-notices.php
r12082 r12104 13 13 <?php if ( bp_nouveau_has_dismiss_button() ) : ?> 14 14 15 <button type="button" class="bp-tooltip" data-bp-tooltip="<?php e sc_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> 16 16 17 17 <?php endif; ?> -
trunk/src/bp-templates/bp-nouveau/buddypress/common/search-and-filters-bar.php
r12082 r12104 13 13 14 14 <?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> 16 16 <?php endif; ?> 17 17 -
trunk/src/bp-templates/bp-nouveau/buddypress/common/search/search-form.php
r12082 r12104 17 17 <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' ); ?>"> 18 18 <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> 20 20 </button> 21 21 -
trunk/src/bp-templates/bp-nouveau/buddypress/groups/create.php
r12082 r12104 8 8 bp_nouveau_groups_create_hook( 'before', 'page' ); ?> 9 9 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> 11 11 12 12 <?php bp_nouveau_groups_create_hook( 'before', 'content_template' ); ?> -
trunk/src/bp-templates/bp-nouveau/buddypress/groups/groups-loop.php
r12082 r12104 45 45 <?php endif; ?> 46 46 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> 48 56 49 57 </div> -
trunk/src/bp-templates/bp-nouveau/buddypress/groups/single/activity.php
r12082 r12104 19 19 <ul> 20 20 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> 22 22 23 23 <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 9 9 10 10 <h2 class="bp-screen-title warn"> 11 <?php _e( 'Delete this group', 'buddypress' ); ?>11 <?php esc_html_e( 'Delete this group', 'buddypress' ); ?> 12 12 </h2> 13 13 … … 16 16 <label for="delete-group-understand" class="bp-label-text warn"> 17 17 <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' ); ?> 19 19 </label> -
trunk/src/bp-templates/bp-nouveau/buddypress/groups/single/admin/edit-details.php
r12082 r12104 11 11 12 12 <h3 class="bp-screen-title creation-step-name"> 13 <?php _e( 'Enter Group Name & Description', 'buddypress' ); ?>13 <?php esc_html_e( 'Enter Group Name & Description', 'buddypress' ); ?> 14 14 </h3> 15 15 … … 17 17 18 18 <h2 class="bp-screen-title"> 19 <?php _e( 'Edit Group Name & Description', 'buddypress' ); ?>19 <?php esc_html_e( 'Edit Group Name & Description', 'buddypress' ); ?> 20 20 </h2> 21 21 22 22 <?php endif; ?> 23 23 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> 25 25 <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" /> 26 26 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> 28 28 <textarea name="group-desc" id="group-desc" aria-required="true"><?php bp_is_group_create() ? bp_new_group_description() : bp_group_description_editable(); ?></textarea> 29 29 … … 31 31 <p class="bp-controls-wrap"> 32 32 <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' ); ?> 34 34 </label> 35 35 </p> -
trunk/src/bp-templates/bp-nouveau/buddypress/groups/single/admin/group-avatar.php
r12082 r12104 24 24 <?php if ( ! bp_is_group_create() ) : ?> 25 25 <?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> 27 27 <?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> 29 29 <?php endif; ?> 30 30 <?php endif; ?> … … 44 44 <?php endif; ?> 45 45 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> 47 47 48 48 <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> 50 50 <input type="file" name="file" id="file" /> 51 51 <input type="submit" name="upload" id="upload" value="<?php esc_attr_e( 'Upload Image', 'buddypress' ); ?>" /> … … 54 54 55 55 <?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> 57 57 </div><!-- .main-column --> 58 58 59 59 <?php elseif ( bp_get_group_has_avatar() ) : ?> 60 60 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> 62 62 63 63 <?php … … 96 96 ?> 97 97 98 <h2><?php _e( 'Crop Group Profile Photo', 'buddypress' ); ?></h2>98 <h2><?php esc_html_e( 'Crop Group Profile Photo', 'buddypress' ); ?></h2> 99 99 100 100 <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 24 24 <?php endif; ?> 25 25 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> 27 27 28 28 <?php -
trunk/src/bp-templates/bp-nouveau/buddypress/groups/single/admin/group-settings.php
r12082 r12104 25 25 26 26 <fieldset class="radio group-status-type"> 27 <legend><?php _e( 'Privacy Options', 'buddypress' ); ?></legend>27 <legend><?php esc_html_e( 'Privacy Options', 'buddypress' ); ?></legend> 28 28 29 29 <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' ); ?> 31 31 </label> 32 32 33 33 <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> 37 37 </ul> 38 38 39 39 <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' ); ?> 41 41 </label> 42 42 43 43 <ul id="private-group-description"> 44 <li><?php _e( 'Only userswho 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> 47 47 </ul> 48 48 49 49 <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' ); ?> 51 51 </label> 52 52 53 53 <ul id="hidden-group-description"> 54 <li><?php _e( 'Only userswho 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> 57 57 </ul> 58 58 59 59 </fieldset> 60 60 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' ); 64 if ( $group_types ) : ?> 63 65 64 66 <fieldset class="group-create-types"> 65 <legend><?php _e( 'Group Types', 'buddypress' ); ?></legend>67 <legend><?php esc_html_e( 'Group Types', 'buddypress' ); ?></legend> 66 68 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> 68 70 69 71 <?php foreach ( $group_types as $type ) : ?> … … 86 88 87 89 <fieldset class="radio group-invitations"> 88 <legend><?php _e( 'Group Invitations', 'buddypress' ); ?></legend>90 <legend><?php esc_html_e( 'Group Invitations', 'buddypress' ); ?></legend> 89 91 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> 91 93 92 94 <label for="group-invite-status-members"> 93 95 <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' ); ?> 95 97 </label> 96 98 97 99 <label for="group-invite-status-mods"> 98 100 <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' ); ?> 100 102 </label> 101 103 102 104 <label for="group-invite-status-admins"> 103 105 <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' ); ?> 105 107 </label> 106 108 -
trunk/src/bp-templates/bp-nouveau/buddypress/groups/single/admin/manage-members.php
r12082 r12104 9 9 10 10 <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' ); ?> 12 12 </h2> 13 13 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> 15 15 16 16 <dl class="groups-manage-members-list"> 17 17 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> 19 19 20 20 <?php if ( bp_has_members( '&include=' . bp_group_admin_ids() ) ) : ?> … … 33 33 34 34 <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> 36 36 </p> 37 37 … … 47 47 <?php if ( bp_group_has_moderators() ) : ?> 48 48 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> 50 50 51 51 <dd class="moderator-listing"> … … 62 62 63 63 <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> 66 66 </div> 67 67 … … 96 96 <p class="list-title member-name"> 97 97 <?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> 99 106 </p> 100 107 -
trunk/src/bp-templates/bp-nouveau/buddypress/groups/single/cover-image-header.php
r12082 r12104 25 25 <div id="item-header-content"> 26 26 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> 27 34 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>31 35 <?php echo bp_nouveau_group_meta()->group_type_list; ?> 32 33 36 <?php bp_nouveau_group_hook( 'before', 'header_meta' ); ?> 34 37 … … 53 56 </div><!-- #cover-image-container --> 54 57 55 <?php 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; ?> 63 66 <?php endif; ?> -
trunk/src/bp-templates/bp-nouveau/buddypress/groups/single/group-header.php
r12082 r12104 24 24 <p class="highlight group-status"><strong><?php echo esc_html( bp_nouveau_group_meta()->status ); ?></strong></p> 25 25 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> 27 37 28 38 <?php bp_nouveau_group_hook( 'before', 'header_meta' ); ?> -
trunk/src/bp-templates/bp-nouveau/buddypress/groups/single/parts/header-item-actions.php
r12082 r12104 11 11 <?php if ( bp_current_user_can( 'groups_access_group' ) ) : ?> 12 12 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> 14 14 15 15 <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> 17 17 <dd class="user-list admins"><?php bp_group_list_admins(); ?> 18 18 <?php bp_nouveau_group_hook( 'after', 'menu_admins' ); ?> … … 26 26 27 27 <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> 29 29 <dd class="user-list moderators"> 30 30 <?php -
trunk/src/bp-templates/bp-nouveau/buddypress/groups/single/request-membership.php
r12082 r12104 10 10 11 11 <?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> 13 23 14 24 <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> 16 26 <textarea name="group-request-membership-comments" id="group-request-membership-comments"></textarea> 17 27 18 28 <?php bp_nouveau_group_hook( '', 'request_membership_content' ); ?> 19 29 20 <p><input type="submit" name="group-request-send" id="group-request-send" value="<?php e sc_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' ); ?>" /> 21 31 22 32 <?php wp_nonce_field( 'groups_request_membership' ); ?> -
trunk/src/bp-templates/bp-nouveau/buddypress/members/activate.php
r12082 r12104 18 18 19 19 <?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> 21 21 <?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> 23 32 <?php endif; ?> 24 33 25 34 <?php else : ?> 26 35 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> 28 37 29 38 <form action="" method="post" class="standard-form" id="activation-form"> 30 39 31 <label for="key"><?php _e( 'Activation Key:', 'buddypress' ); ?></label>40 <label for="key"><?php esc_html_e( 'Activation Key:', 'buddypress' ); ?></label> 32 41 <input type="text" name="key" id="key" value="<?php echo esc_attr( bp_get_current_activation_key() ); ?>" /> 33 42 34 43 <p class="submit"> 35 <input type="submit" name="submit" value="<?php e sc_attr_e( 'Activate', 'buddypress' ); ?>" />44 <input type="submit" name="submit" value="<?php echo esc_attr_x( 'Activate', 'button', 'buddypress' ); ?>" /> 36 45 </p> 37 46 -
trunk/src/bp-templates/bp-nouveau/buddypress/members/register.php
r12082 r12104 29 29 <?php /***** Basic Account Details ******/ ?> 30 30 31 <h2 class="bp-heading"><?php _e( 'Account Details', 'buddypress' ); ?></h2>31 <h2 class="bp-heading"><?php esc_html_e( 'Account Details', 'buddypress' ); ?></h2> 32 32 33 33 <?php bp_nouveau_signup_form(); ?> … … 45 45 <div class="register-section extended-profile" id="profile-details-section"> 46 46 47 <h2 class="bp-heading"><?php _e( 'Profile Details', 'buddypress' ); ?></h2>47 <h2 class="bp-heading"><?php esc_html_e( 'Profile Details', 'buddypress' ); ?></h2> 48 48 49 49 <?php /* Use the profile field loop to render input fields for the 'base' profile field group */ ?> … … 87 87 <div class="register-section blog-details" id="blog-details-section"> 88 88 89 <h2><?php _e( 'BlogDetails', 'buddypress' ); ?></h2>89 <h2><?php esc_html_e( 'Site Details', 'buddypress' ); ?></h2> 90 90 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> 92 92 93 93 <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 14 14 <div class="bp-feedback custom-homepage-info info"> 15 15 <strong><?php esc_html_e( 'Manage the members default front page', 'buddypress' ); ?></strong> 16 <button type="button" class="bp-tooltip" data-bp-tooltip="<?php e sc_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/> 17 17 <?php 18 18 printf( -
trunk/src/bp-templates/bp-nouveau/buddypress/members/single/groups/invites.php
r12082 r12104 34 34 <h2 class="list-title groups-title"><?php bp_group_link(); ?></h2> 35 35 <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> 37 50 </p> 38 51 -
trunk/src/bp-templates/bp-nouveau/buddypress/members/single/notifications/notifications-loop.php
r12082 r12104 16 16 <tr> 17 17 <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> 20 20 <th class="date"> 21 <?php _e( 'Date Received', 'buddypress' ); ?>21 <?php esc_html_e( 'Date Received', 'buddypress' ); ?> 22 22 <?php bp_nouveau_notifications_sort_order_links(); ?> 23 23 </th> 24 <th class="actions"><?php _e( 'Actions', 'buddypress' ); ?></th>24 <th class="actions"><?php esc_html_e( 'Actions', 'buddypress' ); ?></th> 25 25 </tr> 26 26 </thead> … … 35 35 <tr> 36 36 <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> 38 38 <td class="notification-description"><?php bp_the_notification_description(); ?></td> 39 39 <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 8 8 ?> 9 9 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' ); ?>"> 11 11 12 12 <?php if ( bp_nouveau_has_nav( array( 'type' => 'primary' ) ) ) : ?> -
trunk/src/bp-templates/bp-nouveau/buddypress/members/single/parts/profile-visibility.php
r12082 r12104 18 18 <?php 19 19 printf( 20 /* translators: field visibility level, e.g. "...seen by: everyone". */ 20 21 __( 'This field may be seen by: %s', 'buddypress' ), 21 22 '<span class="current-visibility-level">' . bp_get_the_profile_field_visibility_level_label() . '</span>' 22 23 ); 23 24 ?> 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> 25 26 26 27 </p> … … 28 29 <div class="field-visibility-settings" id="field-visibility-settings-<?php bp_the_profile_field_id(); ?>"> 29 30 <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> 31 32 32 33 <?php bp_profile_visibility_radio_buttons(); ?> 33 34 34 35 </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> 36 37 </div> 37 38 … … 41 42 <?php 42 43 printf( 43 __( 'This field may be seen by: %s', 'buddypress' ),44 esc_html__( 'This field may be seen by: %s', 'buddypress' ), 44 45 '<span class="current-visibility-level">' . bp_get_the_profile_field_visibility_level_label() . '</span>' 45 46 ); -
trunk/src/bp-templates/bp-nouveau/buddypress/members/single/profile/change-avatar.php
r12082 r12104 8 8 ?> 9 9 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> 11 11 12 12 <?php bp_nouveau_member_hook( 'before', 'avatar_upload_content' ); ?> … … 16 16 <p class="bp-feedback info"> 17 17 <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> 19 19 </p> 20 20 … … 24 24 25 25 <?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> 27 27 28 28 <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> 30 30 <input type="file" name="file" id="file" /> 31 31 <input type="submit" name="upload" id="upload" value="<?php esc_attr_e( 'Upload Image', 'buddypress' ); ?>" /> … … 34 34 35 35 <?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, pleaseuse 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> 38 38 <?php endif; ?> 39 39 … … 42 42 <?php if ( 'crop-image' === bp_get_avatar_admin_step() ) : ?> 43 43 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> 45 45 46 46 <img src="<?php bp_avatar_to_crop(); ?>" id="avatar-to-crop" class="avatar" alt="<?php esc_attr_e( 'Profile photo to crop', 'buddypress' ); ?>" /> … … 75 75 <?php else : ?> 76 76 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, pleasecreate 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> 78 78 79 79 <?php endif; ?> -
trunk/src/bp-templates/bp-nouveau/buddypress/members/single/profile/change-cover-image.php
r12082 r12104 9 9 ?> 10 10 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> 12 12 13 13 <?php bp_nouveau_member_hook( 'before', 'edit_cover_image' ); ?> … … 15 15 <p class="info bp-feedback"> 16 16 <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> 18 18 </p> 19 19 -
trunk/src/bp-templates/bp-nouveau/buddypress/members/single/profile/edit.php
r12082 r12104 28 28 <?php endif; ?> 29 29 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> 31 39 32 40 <?php -
trunk/src/bp-templates/bp-nouveau/buddypress/members/single/profile/profile-loop.php
r12082 r12104 9 9 ?> 10 10 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> 12 12 13 13 <?php bp_nouveau_xprofile_hook( 'before', 'loop_content' ); ?> -
trunk/src/bp-templates/bp-nouveau/buddypress/members/single/profile/profile-wp.php
r12082 r12104 14 14 <?php 15 15 if ( bp_is_my_profile() ) { 16 _e( 'My Profile', 'buddypress' );16 esc_html_e( 'My Profile', 'buddypress' ); 17 17 } else { 18 18 printf( -
trunk/src/bp-templates/bp-nouveau/buddypress/members/single/settings/capabilities.php
r12082 r12104 10 10 11 11 <h2 class="screen-heading member-capabilities-screen"> 12 <?php _e( 'Members Capabilities', 'buddypress' ); ?>12 <?php esc_html_e( 'Members Capabilities', 'buddypress' ); ?> 13 13 </h2> 14 14 … … 17 17 <label for="user-spammer"> 18 18 <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' ); ?> 20 20 </label> 21 21 -
trunk/src/bp-templates/bp-nouveau/buddypress/members/single/settings/delete-account.php
r12082 r12104 10 10 11 11 <h2 class="screen-heading delete-account-screen warn"> 12 <?php _e( 'Delete Account', 'buddypress' ); ?>12 <?php esc_html_e( 'Delete Account', 'buddypress' ); ?> 13 13 </h2> 14 14 … … 19 19 <label id="delete-account-understand" class="warn" for="delete-account-understand"> 20 20 <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' ); ?> 22 22 </label> 23 23 -
trunk/src/bp-templates/bp-nouveau/buddypress/members/single/settings/general.php
r12082 r12104 22 22 23 23 <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' ); ?>/> <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' ); ?>/> <a href="<?php echo esc_url( wp_lostpassword_url() ); ?>"><?php esc_html_e( 'Lost your password?', 'buddypress' ); ?></a> 25 25 26 26 <?php endif; ?> … … 31 31 <div class="info bp-feedback"> 32 32 <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> 34 34 </div> 35 35 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> 37 37 <input type="password" name="pass1" id="pass1" size="16" value="" class="settings-input small password-entry" <?php bp_form_field_attributes( 'password' ); ?>/> 38 38 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> 40 40 <input type="password" name="pass2" id="pass2" size="16" value="" class="settings-input small password-entry-confirm" <?php bp_form_field_attributes( 'password' ); ?>/> 41 41 -
trunk/src/bp-templates/bp-nouveau/buddypress/members/single/settings/profile.php
r12082 r12104 10 10 11 11 <h2 class="screen-heading profile-settings-screen"> 12 <?php _e( 'Profile Visibility Settings', 'buddypress' ); ?>12 <?php esc_html_e( 'Profile Visibility Settings', 'buddypress' ); ?> 13 13 </h2> 14 14 15 15 <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' ); ?> 17 17 </p> 18 18 … … 32 32 <tr> 33 33 <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> 35 35 </tr> 36 36 </thead> -
trunk/src/bp-templates/bp-nouveau/includes/activity/ajax.php
r12082 r12104 453 453 454 454 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' ) ) ); 456 456 } else { 457 457 wp_send_json_success( $response ); … … 580 580 'feedback' => sprintf( 581 581 '<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' ) 583 583 ), 584 584 ); … … 629 629 if ( ! empty( $_POST['is_single'] ) ) { 630 630 $response['redirect'] = bp_core_get_user_domain( $activity->user_id ); 631 bp_core_add_message( __( 'Th e activity itemhas 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' ) ); 632 632 } 633 633 -
trunk/src/bp-templates/bp-nouveau/includes/activity/functions.php
r12082 r12104 85 85 'avatar_width' => $width, 86 86 '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 ), 89 93 ) ); 90 94 } -
trunk/src/bp-templates/bp-nouveau/includes/activity/template-tags.php
r12082 r12104 312 312 'link_text' => sprintf( 313 313 '<span class="bp-screen-reader-text">%1$s</span>', 314 esc_html__( 'View Conversation', 'buddypress' )314 __( 'View Conversation', 'buddypress' ) 315 315 ), 316 316 ); … … 340 340 'id' => 'acomment-comment-' . $activity_id, 341 341 'class' => 'button acomment-reply bp-primary-action bp-tooltip', 342 'data-bp-tooltip' => _ _( 'Comment', 'buddypress' ),342 'data-bp-tooltip' => _x( 'Comment', 'button', 'buddypress' ), 343 343 'aria-expanded' => 'false', 344 344 ), 345 345 'link_text' => sprintf( 346 346 '<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' ), 348 348 esc_html( bp_activity_get_comment_count() ) 349 349 ), … … 454 454 'link_class' => 'button item-button bp-secondary-action bp-tooltip delete-activity confirm', 455 455 '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' ), 458 458 'link_href' => bp_get_activity_delete_url(), 459 459 ); … … 499 499 'button_attr' => array( 500 500 'class' => 'bp-secondary-action spam-activity confirm button item-button bp-tooltip', 501 'id' => 502 'data-bp-tooltip' => __( 'Spam', 'buddypress' ),501 'id' => 'activity_make_spam_' . $activity_id, 502 'data-bp-tooltip' => _x( 'Spam', 'button', 'buddypress' ), 503 503 ), 504 504 'link_text' => sprintf( 505 505 /** @todo: use a specific css rule for this *************************************************************/ 506 506 '<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' ) 508 508 ), 509 509 ); … … 795 795 'parent_attr' => $parent_attr, 796 796 'button_element' => $button_element, 797 'link_text' => _ _( 'Reply', 'buddypress' ),798 'button_attr' => 797 'link_text' => _x( 'Reply', 'link', 'buddypress' ), 798 'button_attr' => array( 799 799 'class' => "acomment-reply bp-primary-action", 800 800 'id' => sprintf( 'acomment-reply-%1$s-from-%2$s', $activity_id, $activity_comment_id ), … … 809 809 'parent_attr' => $parent_attr, 810 810 'button_element' => $button_element, 811 'link_text' => _ _( 'Delete', 'buddypress' ),811 'link_text' => _x( 'Delete', 'link', 'buddypress' ), 812 812 'button_attr' => array( 813 813 'class' => 'delete acomment-delete confirm bp-secondary-action', 814 814 'rel' => 'nofollow', 815 815 ), 816 816 ), 817 817 ); … … 836 836 'parent_attr' => $parent_attr, 837 837 'button_element' => $button_element, 838 'link_text' => _ _( 'Spam', 'buddypress' ),838 'link_text' => _x( 'Spam', 'link', 'buddypress' ), 839 839 'button_attr' => array( 840 840 'id' => "activity_make_spam_{$activity_comment_id}", -
trunk/src/bp-templates/bp-nouveau/includes/activity/widgets.php
r12082 r12104 33 33 'bp_latest_activities', array( 34 34 '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' ), 36 36 'customize_selective_refresh' => true, 37 37 ) … … 186 186 187 187 <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> 189 189 <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" /> 190 190 </p> -
trunk/src/bp-templates/bp-nouveau/includes/blogs/functions.php
r12082 r12104 166 166 return array_merge( $controls, array( 167 167 'blogs_layout' => array( 168 'label' => __( ' Blogs loop:', 'buddypress' ),168 'label' => __( 'Sites loop:', 'buddypress' ), 169 169 'section' => 'bp_nouveau_loops_layout', 170 170 'settings' => 'bp_nouveau_appearance[blogs_layout]', -
trunk/src/bp-templates/bp-nouveau/includes/classes.php
r12082 r12104 44 44 */ 45 45 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 51 46 foreach ( $args as $arg ) { 52 47 $r = wp_parse_args( (array) $arg, array( … … 198 193 parent::__construct( 199 194 'bp_nouveau_sidebar_object_nav_widget', 200 __( '(BuddyPress) Primary nav ', 'buddypress' ),195 __( '(BuddyPress) Primary navigation', 'buddypress' ), 201 196 $widget_ops 202 197 ); -
trunk/src/bp-templates/bp-nouveau/includes/customizer-controls.php
r12082 r12104 56 56 57 57 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 navitems 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' ); 59 59 } 60 60 … … 63 63 $item_nav = bp_nouveau_member_customizer_nav(); 64 64 65 $guide = __( 'Drag each possible user navitems 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' ); 66 66 } 67 67 ?> -
trunk/src/bp-templates/bp-nouveau/includes/customizer.php
r12082 r12104 44 44 ), 45 45 'bp_nouveau_user_front_page' => array( 46 'title' => __( ' User front page', 'buddypress' ),46 'title' => __( 'Member front page', 'buddypress' ), 47 47 'panel' => 'bp_nouveau_panel', 48 48 'priority' => 30, 49 'description' => __( 'Configure the default front page for users.', 'buddypress' ),49 'description' => __( 'Configure the default front page for members.', 'buddypress' ), 50 50 ), 51 51 'bp_nouveau_user_primary_nav' => array( 52 'title' => __( ' User navigation', 'buddypress' ),52 'title' => __( 'Member navigation', 'buddypress' ), 53 53 'panel' => 'bp_nouveau_panel', 54 54 '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' ), 56 56 ), 57 57 'bp_nouveau_loops_layout' => array( … … 230 230 ), 231 231 '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' ), 233 233 'section' => 'bp_nouveau_user_front_page', 234 234 'settings' => 'bp_nouveau_appearance[user_front_bio]', … … 236 236 ), 237 237 'user_nav_display' => array( 238 'label' => __( 'Display the user navigation vertically.', 'buddypress' ),238 'label' => __( 'Display the member navigation vertically.', 'buddypress' ), 239 239 'section' => 'bp_nouveau_user_primary_nav', 240 240 'settings' => 'bp_nouveau_appearance[user_nav_display]', -
trunk/src/bp-templates/bp-nouveau/includes/functions.php
r12082 r12104 317 317 if ( $default_user_front ) { 318 318 $sidebars[] = array( 319 'name' => __( 'BuddyPress User\'s Home', 'buddypress' ),319 'name' => __( 'BuddyPress Member\'s Home', 'buddypress' ), 320 320 'id' => 'sidebar-buddypress-members', 321 321 'description' => __( 'Add widgets here to appear in the front page of each member of your community.', 'buddypress' ), … … 921 921 'registration-disabled' => array( 922 922 'type' => 'info', 923 'message' => __( ' User registration is currently not allowed.', 'buddypress' ),923 'message' => __( 'Member registration is currently not allowed.', 'buddypress' ), 924 924 'before' => 'bp_before_registration_disabled', 925 925 'after' => 'bp_after_registration_disabled' … … 1035 1035 'member-activity-loading' => array( 1036 1036 'type' => 'loading', 1037 'message' => __( 'Loading the user\'s updates. Please wait.', 'buddypress' ),1037 'message' => __( 'Loading the member\'s updates. Please wait.', 'buddypress' ), 1038 1038 ), 1039 1039 'member-blogs-loading' => array( 1040 1040 'type' => 'loading', 1041 'message' => __( 'Loading the user\'s blogs. Please wait.', 'buddypress' ),1041 'message' => __( 'Loading the member\'s blogs. Please wait.', 'buddypress' ), 1042 1042 ), 1043 1043 'member-friends-loading' => array( 1044 1044 'type' => 'loading', 1045 'message' => __( 'Loading the user\'s friends. Please wait.', 'buddypress' ),1045 'message' => __( 'Loading the member\'s friends. Please wait.', 'buddypress' ), 1046 1046 ), 1047 1047 'member-groups-loading' => array( 1048 1048 'type' => 'loading', 1049 'message' => __( 'Loading the user\'s groups. Please wait.', 'buddypress' ),1049 'message' => __( 'Loading the member\'s groups. Please wait.', 'buddypress' ), 1050 1050 ), 1051 1051 'member-notifications-loading' => array( -
trunk/src/bp-templates/bp-nouveau/includes/groups/ajax.php
r12082 r12104 102 102 'feedback' => sprintf( 103 103 '<div class="bp-feedback error"><span class="bp-icon" aria-hidden="true"></span><p>%s</p></div>', 104 esc_html__( 'Group invit ecould not be accepted.', 'buddypress' )104 esc_html__( 'Group invitation could not be accepted.', 'buddypress' ) 105 105 ), 106 106 'type' => 'error', … … 283 283 284 284 $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' ); 286 286 287 287 if ( 'friends' === $request['scope'] ) { 288 288 $request['user_id'] = bp_loggedin_user_id(); 289 289 $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' ); 291 291 } 292 292 … … 295 295 if ( ! bp_group_has_invites( array( 'user_id' => 'any' ) ) ) { 296 296 wp_send_json_error( array( 297 'feedback' => __( 'No pending invites found.', 'buddypress' ),297 'feedback' => __( 'No pending group invitations found.', 'buddypress' ), 298 298 'type' => 'info', 299 299 ) ); … … 302 302 $request['is_confirmed'] = false; 303 303 $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' ); 305 305 } 306 306 … … 366 366 367 367 if ( ! bp_groups_user_can_send_invites( $group_id ) ) { 368 $response['feedback'] = __( 'You are not allowed to send invit es for this group.', 'buddypress' );368 $response['feedback'] = __( 'You are not allowed to send invitations for this group.', 'buddypress' ); 369 369 wp_send_json_error( $response ); 370 370 } … … 405 405 406 406 $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 ); 408 416 409 417 wp_send_json_error( … … 418 426 wp_send_json_success( 419 427 array( 420 'feedback' => __( 'Invit es sent.', 'buddypress' ),428 'feedback' => __( 'Invitations sent.', 'buddypress' ), 421 429 'type' => 'success', 422 430 ) … … 428 436 */ 429 437 function bp_nouveau_ajax_remove_group_invite() { 430 $user_id = $_POST['user'];438 $user_id = (int) $_POST['user']; 431 439 $group_id = bp_get_current_group_id(); 432 440 … … 435 443 wp_send_json_error( 436 444 array( 437 'feedback' => __( ' Invites could not be removed. Please try again.', 'buddypress' ),445 'feedback' => __( 'Group invitation could not be removed.', 'buddypress' ), 438 446 'type' => 'error', 439 447 ) … … 444 452 wp_send_json_error( 445 453 array( 446 'feedback' => __( 'T oo late! The user is already a member of the group.', 'buddypress' ),454 'feedback' => __( 'The member is already a member of the group.', 'buddypress' ), 447 455 'type' => 'warning', 448 456 'code' => 1, … … 455 463 wp_send_json_error( 456 464 array( 457 'feedback' => __( ' Invite could not be removed successfully.', 'buddypress' ),465 'feedback' => __( 'Group invitation could not be removed.', 'buddypress' ), 458 466 'type' => 'error', 459 467 'code' => 0, … … 464 472 wp_send_json_success( 465 473 array( 466 'feedback' => __( ' No more pending invites for the group.', 'buddypress' ),474 'feedback' => __( 'There are no more pending invitations for the group.', 'buddypress' ), 467 475 'type' => 'info', 468 476 'has_invites' => bp_group_has_invites( array( 'user_id' => 'any' ) ), -
trunk/src/bp-templates/bp-nouveau/includes/groups/functions.php
r12082 r12104 25 25 } 26 26 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>'; 28 28 29 29 return $message; … … 150 150 'loading' => __( 'Loading members. Please wait.', 'buddypress' ), 151 151 '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' ), 155 155 'group_id' => ! bp_get_current_group_id() ? bp_get_new_group_id() : bp_get_current_group_id(), 156 156 'is_group_create' => bp_is_group_create(), … … 295 295 /** 296 296 * @since 3.0.0 297 * @todo I don't see any reason why to restrict group invites to friends..298 297 */ 299 298 function bp_nouveau_group_invites_create_steps( $steps = array() ) { 300 299 if ( bp_is_active( 'friends' ) && isset( $steps['group-invites'] ) ) { 301 300 // 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' ); 303 302 return $steps; 304 303 } … … 306 305 // Add the create step if friends component is not active 307 306 $steps['group-invites'] = array( 308 'name' => _x( 'Invite', 'Group screen nav', 'buddypress' ),307 'name' => _x( 'Invite', 'Group invitations menu title', 'buddypress' ), 309 308 'position' => 30, 310 309 ); … … 326 325 327 326 $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' ) ), 329 328 'send-invites', 330 329 bp_get_current_group_slug() … … 337 336 338 337 bp_core_new_subnav_item( array( 339 'name' => _x( 'Invite', ' My Group screen nav', 'buddypress' ),338 'name' => _x( 'Invite', 'Group invitations menu title', 'buddypress' ), 340 339 'slug' => 'send-invites', 341 340 'parent_url' => $group_link, … … 395 394 'avatar_url' => $item_avatar_url, 396 395 'object_type' => 'group', 397 'is_public' => 'public' === $item->status,396 'is_public' => ( 'public' === $item->status ), 398 397 ); 399 398 } … … 413 412 414 413 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' ), 416 415 'slug' => 'invites', 417 416 'parent_url' => trailingslashit( $user_domain . $slug ), … … 441 440 'parent' => 'my-account-' . buddypress()->settings->id, 442 441 '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' ), 444 443 'href' => trailingslashit( $settings_link . 'invites/' ), 445 444 ); … … 694 693 'panel' => 'bp_nouveau_panel', 695 694 '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' ), 697 696 ), 698 697 ) ); … … 801 800 ), 802 801 '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' ), 804 803 'section' => 'bp_nouveau_group_front_page', 805 804 'settings' => 'bp_nouveau_appearance[group_front_boxes]', … … 807 806 ), 808 807 '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' ), 810 809 'section' => 'bp_nouveau_group_front_page', 811 810 'settings' => 'bp_nouveau_appearance[group_front_description]', … … 819 818 ), 820 819 'group_nav_tabs' => array( 821 'label' => __( 'Use tab styling for primary nav .', 'buddypress' ),820 'label' => __( 'Use tab styling for primary navigation.', 'buddypress' ), 822 821 'section' => 'bp_nouveau_group_primary_nav', 823 822 'settings' => 'bp_nouveau_appearance[group_nav_tabs]', … … 825 824 ), 826 825 'group_subnav_tabs' => array( 827 'label' => __( 'Use tab styling for secondary nav .', 'buddypress' ),826 'label' => __( 'Use tab styling for secondary navigation.', 'buddypress' ), 828 827 'section' => 'bp_nouveau_group_primary_nav', 829 828 'settings' => 'bp_nouveau_appearance[group_subnav_tabs]', … … 844 843 ), 845 844 'groups_layout' => array( 846 'label' => _ _( 'Groups', 'buddypress' ),845 'label' => _x( 'Groups', 'Customizer control label', 'buddypress' ), 847 846 'section' => 'bp_nouveau_loops_layout', 848 847 'settings' => 'bp_nouveau_appearance[groups_layout]', … … 955 954 // Loop in the hierarchy to fill it for the requested template part 956 955 foreach ( $bp_nouveau->groups->current_group_hierarchy as $part ) { 957 $templates[] = sprintf( $part, $template);956 $templates[] = sprintf( $part, sanitize_file_name( $template ) ); 958 957 } 959 958 … … 1010 1009 */ 1011 1010 function 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 ); 1013 1012 } 1014 1013 … … 1198 1197 array( 1199 1198 'id' => 'member_promoted_to_admin', 1200 'label' => __( 'Group Admin promotions', 'buddypress' ),1199 'label' => __( 'Group Administrator promotions', 'buddypress' ), 1201 1200 'position' => 85, 1202 1201 ), … … 1208 1207 array( 1209 1208 'id' => 'group_invite', 1210 'label' => __( 'Group invit es', 'buddypress' ),1209 'label' => __( 'Group invitations', 'buddypress' ), 1211 1210 'position' => 105, 1212 1211 ), -
trunk/src/bp-templates/bp-nouveau/includes/members/functions.php
r12082 r12104 356 356 */ 357 357 function 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 ); 359 359 } 360 360 -
trunk/src/bp-templates/bp-nouveau/includes/members/template-tags.php
r12092 r12104 287 287 'must_be_logged_in' => true, 288 288 'parent_element' => $parent_element, 289 'link_text' => _ _( 'Accept', 'buddypress' ),289 'link_text' => _x( 'Accept', 'button', 'buddypress' ), 290 290 'parent_attr' => array( 291 291 'id' => '', … … 303 303 'must_be_logged_in' => true, 304 304 'parent_element' => $parent_element, 305 'link_text' => _ _( 'Reject', 'buddypress' ),305 'link_text' => _x( 'Reject', 'button', 'buddypress' ), 306 306 'parent_attr' => array( 307 307 'id' => '', -
trunk/src/bp-templates/bp-nouveau/includes/messages/ajax.php
r12082 r12104 436 436 function bp_nouveau_ajax_delete_thread_messages() { 437 437 $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' ), 439 439 'type' => 'error', 440 440 ); … … 459 459 460 460 wp_send_json_success( array( 461 'feedback' => __( 'Message (s)deleted', 'buddypress' ),461 'feedback' => __( 'Messages deleted', 'buddypress' ), 462 462 'type' => 'success', 463 463 ) ); … … 475 475 476 476 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' ); 478 478 } 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' ); 480 480 } 481 481 … … 551 551 552 552 if ( 'star' === $action ) { 553 $success_message = __( 'Message (s)successfully starred.', 'buddypress' );553 $success_message = __( 'Messages successfully starred.', 'buddypress' ); 554 554 } else { 555 $success_message = __( 'Message (s)successfully unstarred.', 'buddypress' );555 $success_message = __( 'Messages successfully unstarred.', 'buddypress' ); 556 556 } 557 557 … … 574 574 575 575 $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' ), 577 577 'type' => 'error', 578 578 ); … … 580 580 if ( 'unread' === $action ) { 581 581 $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' ), 583 583 'type' => 'error', 584 584 ); … … 598 598 599 599 if ( 'unread' === $action ) { 600 $response['feedback'] = __( 'Message (s)marked as unread.', 'buddypress' );600 $response['feedback'] = __( 'Messages marked as unread.', 'buddypress' ); 601 601 } else { 602 $response['feedback'] = __( 'Message (s)marked as read.', 'buddypress' );602 $response['feedback'] = __( 'Messages marked as read.', 'buddypress' ); 603 603 } 604 604 -
trunk/src/bp-templates/bp-nouveau/includes/messages/functions.php
r12082 r12104 102 102 'loading' => __( 'Loading messages. Please wait.', 'buddypress' ), 103 103 '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' ), 109 109 ), 110 110 'bulk_actions' => bp_nouveau_messages_get_bulk_actions(), … … 146 146 $search_form_html = '<form action="" method="get" id="search-messages-form"> 147 147 <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' ) . '" /> 149 149 </form>'; 150 150 … … 261 261 262 262 return array( 263 'text' => esc_html__( 'New sitewide notice', 'buddypress' ),263 'text' => __( 'New sitewide notice', 'buddypress' ), 264 264 'link' => bp_loggedin_user_domain(), 265 265 ); -
trunk/src/bp-templates/bp-nouveau/includes/notifications/functions.php
r12082 r12104 201 201 * @since 3.0.0 202 202 * 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. 205 206 */ 206 207 function 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 ); 208 213 } 209 214 … … 213 218 * @since 3.0.0 214 219 * 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. 217 223 */ 218 224 function 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 ); 220 230 } 221 231 … … 225 235 * @since 3.0.0 226 236 * 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. 229 240 */ 230 241 function 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 84 84 <span class="notifications-order-actions"> 85 85 <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( 'Olde r First', 'buddypress' ); ?>" aria-label="<?php esc_attr_e( 'OlderFirst', '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> 87 87 </span> 88 88 … … 101 101 102 102 <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' ); 105 104 ?></label> 106 105 107 106 <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> 109 108 110 109 <?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> 112 111 <?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> 114 113 <?php endif; ?> 115 <option value="delete"><?php _e( 'Delete', 'buddypress' ); ?></option>114 <option value="delete"><?php echo esc_html_x( 'Delete', 'button', 'buddypress' ); ?></option> 116 115 </select> 117 116 … … 120 119 </div><!-- // .select-wrap --> 121 120 122 <input type="submit" id="notification-bulk-manage" class="button action" value="<?php e sc_attr_e( 'Apply', 'buddypress' ); ?>">121 <input type="submit" id="notification-bulk-manage" class="button action" value="<?php echo esc_attr_x( 'Apply', 'button', 'buddypress' ); ?>"> 123 122 <?php 124 123 } -
trunk/src/bp-templates/bp-nouveau/includes/template-tags.php
r12082 r12104 2242 2242 2243 2243 foreach ( $fields as $name => $attributes ) { 2244 $classes = '';2245 2246 2244 list( $label, $required, $value, $attribute_type, $type, $class ) = array_values( $attributes ); 2247 2248 if ( $required ) {2249 $required = ' ' . _x( '(required)', 'signup required field', 'buddypress' );2250 }2251 2245 2252 2246 // Text fields are using strings, radios are using their inputs 2253 2247 $label_output = '<label for="%1$s">%2$s</label>'; 2254 2248 $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 } 2255 2255 2256 2256 // Output the label for regular fields 2257 2257 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 } 2259 2263 2260 2264 if ( ! empty( $value ) && is_callable( $value ) ) {
Note: See TracChangeset
for help on using the changeset viewer.