Changeset 12012
- Timestamp:
- 08/10/2022 05:03:34 PM (3 years ago)
- Location:
- sites/trunk/wordpress.org/public_html/wp-content/plugins
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-moderators.php
r10660 r12012 316 316 // Check for empty post id. 317 317 if ( ! $post ) { 318 bbp_add_error( 'wporg_bbp_archive_post_id', __( '<strong>E RROR</strong>:No post was found! Which post are you archiving?', 'wporg-forums' ) );318 bbp_add_error( 'wporg_bbp_archive_post_id', __( '<strong>Error:</strong> No post was found! Which post are you archiving?', 'wporg-forums' ) ); 319 319 320 320 // Check for current user. 321 321 } elseif ( empty( $user_id ) ) { 322 bbp_add_error( 'wporg_bbp_archive_logged_in', __( '<strong>E RROR</strong>:You must be logged in to do this!', 'wporg-forums' ) );322 bbp_add_error( 'wporg_bbp_archive_logged_in', __( '<strong>Error:</strong> You must be logged in to do this!', 'wporg-forums' ) ); 323 323 324 324 // Check nonce. 325 325 } elseif ( ! bbp_verify_nonce_request( 'toggle-post-archive_' . $user_id . '_' . $post->ID ) ) { 326 bbp_add_error( 'wporg_bbp_archive_nonce', __( '<strong>E RROR</strong>:Are you sure you wanted to do that?', 'wporg-forums' ) );326 bbp_add_error( 'wporg_bbp_archive_nonce', __( '<strong>Error:</strong> Are you sure you wanted to do that?', 'wporg-forums' ) ); 327 327 328 328 } … … 351 351 bbp_redirect( $permalink ); 352 352 } elseif ( true === $is_archived && 'wporg_bbp_archive_post' === $action ) { 353 bbp_add_error( 'wporg_bbp_archive_post', __( '<strong>E RROR</strong>:There was a problem archiving that post!', 'wporg-forums' ) );353 bbp_add_error( 'wporg_bbp_archive_post', __( '<strong>Error:</strong> There was a problem archiving that post!', 'wporg-forums' ) ); 354 354 } elseif ( false === $is_archived && 'wporg_bbp_unarchive_post' === $action ) { 355 bbp_add_error( 'wporg_bbp_unarchive_post', __( '<strong>E RROR</strong>:There was a problem unarchiving that post!', 'wporg-forums' ) );355 bbp_add_error( 'wporg_bbp_unarchive_post', __( '<strong>Error:</strong> There was a problem unarchiving that post!', 'wporg-forums' ) ); 356 356 } 357 357 } … … 712 712 $topic = bbp_get_topic( $topic_id ); 713 713 if ( empty( $topic ) ) { 714 bbp_add_error( 'bbp_toggle_topic_missing', __( '<strong>E RROR:</strong> This topic could not be found or no longer exists.', 'wporg-forums' ) );714 bbp_add_error( 'bbp_toggle_topic_missing', __( '<strong>Error:</strong> This topic could not be found or no longer exists.', 'wporg-forums' ) ); 715 715 return; 716 716 } … … 718 718 // What is the user doing here? 719 719 if ( ! current_user_can( 'edit_topic', $topic_id ) ) { 720 bbp_add_error( 'bbp_toggle_topic_permission', __( '<strong>E RROR:</strong> You do not have permission to do that.', 'wporg-forums' ) );720 bbp_add_error( 'bbp_toggle_topic_permission', __( '<strong>Error:</strong> You do not have permission to do that.', 'wporg-forums' ) ); 721 721 return; 722 722 } … … 776 776 $reply = bbp_get_reply( $reply_id ); 777 777 if ( empty( $reply ) ) { 778 bbp_add_error( 'bbp_toggle_reply_missing', __( '<strong>E RROR:</strong> This reply could not be found or no longer exists.', 'wporg-forums' ) );778 bbp_add_error( 'bbp_toggle_reply_missing', __( '<strong>Error:</strong> This reply could not be found or no longer exists.', 'wporg-forums' ) ); 779 779 return; 780 780 } … … 782 782 // What is the user doing here? 783 783 if ( ! current_user_can( 'edit_reply', $reply_id ) ) { 784 bbp_add_error( 'bbp_toggle_reply_permission', __( '<strong>E RROR:</strong> You do not have permission to do that.', 'wporg-forums' ) );784 bbp_add_error( 'bbp_toggle_reply_permission', __( '<strong>Error:</strong> You do not have permission to do that.', 'wporg-forums' ) ); 785 785 return; 786 786 } … … 840 840 if ( bbp_is_topic_open( $r['id'] ) ) { 841 841 $retval['status'] = bbp_close_topic( $r['id'] ); 842 $retval['message'] = __( '<strong>E RROR</strong>:There was a problem closing the topic.', 'wporg-forums' );842 $retval['message'] = __( '<strong>Error:</strong> There was a problem closing the topic.', 'wporg-forums' ); 843 843 } 844 844 … … 850 850 if ( ! bbp_is_topic_open( $r['id'] ) ) { 851 851 $retval['status'] = bbp_open_topic( $r['id'] ); 852 $retval['message'] = __( '<strong>E RROR</strong>:There was a problem opening the topic.', 'wporg-forums' );852 $retval['message'] = __( '<strong>Error:</strong> There was a problem opening the topic.', 'wporg-forums' ); 853 853 } 854 854 … … 860 860 if ( ! bbp_is_topic_sticky( $r['id'] ) ) { 861 861 $retval['status'] = bbp_stick_topic( $r['id'], ! empty( $_GET['super'] ) ); 862 $retval['message'] = __( '<strong>E RROR</strong>:There was a problem sticking the topic.', 'wporg-forums' );862 $retval['message'] = __( '<strong>Error:</strong> There was a problem sticking the topic.', 'wporg-forums' ); 863 863 } 864 864 … … 870 870 if ( bbp_is_topic_sticky( $r['id'] ) ) { 871 871 $retval['status'] = bbp_unstick_topic( $r['id'] ); 872 $retval['message'] = __( '<strong>E RROR</strong>:There was a problem unsticking the topic.', 'wporg-forums' );872 $retval['message'] = __( '<strong>Error:</strong> There was a problem unsticking the topic.', 'wporg-forums' ); 873 873 } 874 874 … … 880 880 if ( ! bbp_is_topic_spam( $r['id'] ) ) { 881 881 $retval['status'] = bbp_spam_topic( $r['id'] ); 882 $retval['message'] = __( '<strong>E RROR</strong>:There was a problem marking the topic as spam.', 'wporg-forums' );882 $retval['message'] = __( '<strong>Error:</strong> There was a problem marking the topic as spam.', 'wporg-forums' ); 883 883 } 884 884 $retval['view_all'] = true; … … 891 891 if ( bbp_is_topic_spam( $r['id'] ) ) { 892 892 $retval['status'] = bbp_unspam_topic( $r['id'] ); 893 $retval['message'] = __( '<strong>E RROR</strong>:There was a problem unmarking the topic as spam.', 'wporg-forums' );893 $retval['message'] = __( '<strong>Error:</strong> There was a problem unmarking the topic as spam.', 'wporg-forums' ); 894 894 } 895 895 $retval['view_all'] = false; … … 902 902 if ( ! bbp_is_topic_pending( $r['id'] ) ) { 903 903 $retval['status'] = bbp_unapprove_topic( $r['id'] ); 904 $retval['message'] = __( '<strong>E RROR</strong>:There was a problem unapproving the topic.', 'wporg-forums' );904 $retval['message'] = __( '<strong>Error:</strong> There was a problem unapproving the topic.', 'wporg-forums' ); 905 905 } 906 906 $retval['view_all'] = true; … … 913 913 if ( bbp_is_topic_pending( $r['id'] ) ) { 914 914 $retval['status'] = bbp_approve_topic( $r['id'] ); 915 $retval['message'] = __( '<strong>E RROR</strong>:There was a problem approving the topic.', 'wporg-forums' );915 $retval['message'] = __( '<strong>Error:</strong> There was a problem approving the topic.', 'wporg-forums' ); 916 916 } 917 917 $retval['view_all'] = false; … … 953 953 if ( ! bbp_is_reply_spam( $r['id'] ) ) { 954 954 $retval['status'] = bbp_spam_reply( $r['id'] ); 955 $retval['message'] = __( '<strong>E RROR</strong>:There was a problem marking the reply as spam.', 'wporg-forums' );955 $retval['message'] = __( '<strong>Error:</strong> There was a problem marking the reply as spam.', 'wporg-forums' ); 956 956 } 957 957 $retval['view_all'] = true; … … 964 964 if ( bbp_is_reply_spam( $r['id'] ) ) { 965 965 $retval['status'] = bbp_unspam_reply( $r['id'] ); 966 $retval['message'] = __( '<strong>E RROR</strong>:There was a problem unmarking the reply as spam.', 'wporg-forums' );966 $retval['message'] = __( '<strong>Error:</strong> There was a problem unmarking the reply as spam.', 'wporg-forums' ); 967 967 } 968 968 $retval['view_all'] = false; … … 975 975 if ( ! bbp_is_reply_pending( $r['id'] ) ) { 976 976 $retval['status'] = bbp_unapprove_reply( $r['id'] ); 977 $retval['message'] = __( '<strong>E RROR</strong>:There was a problem unapproving the reply.', 'wporg-forums' );977 $retval['message'] = __( '<strong>Error:</strong> There was a problem unapproving the reply.', 'wporg-forums' ); 978 978 } 979 979 $retval['view_all'] = true; … … 986 986 if ( bbp_is_reply_pending( $r['id'] ) ) { 987 987 $retval['status'] = bbp_approve_reply( $r['id'] ); 988 $retval['message'] = __( '<strong>E RROR</strong>:There was a problem approving the reply.', 'wporg-forums' );988 $retval['message'] = __( '<strong>Error:</strong> There was a problem approving the reply.', 'wporg-forums' ); 989 989 } 990 990 $retval['view_all'] = false; -
sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-ratings-compat.php
r11385 r12012 363 363 sprintf( 364 364 /* translators: %s: Link to forum user guide explaining this. */ 365 __( '<strong>Error </strong>:Please <a href="%s">do not add links to your review</a>, keep the review about your experience in text only.', 'wporg-forums' ),365 __( '<strong>Error:</strong> Please <a href="%s">do not add links to your review</a>, keep the review about your experience in text only.', 'wporg-forums' ), 366 366 'https://wordpress.org/support/forum-user-guide/faq/#why-are-links-not-allowed-in-reviews' 367 367 ) … … 393 393 if ( bbpress()->errors->get_error_message( 'bbp_topic_title' ) && empty( $_POST['bbp_topic_title'] ) ) { 394 394 bbpress()->errors->remove( 'bbp_topic_title' ); 395 bbp_add_error( 'bbp_topic_title', __( '<strong>Error </strong>:Your review needs a title.', 'wporg-forums' ) );395 bbp_add_error( 'bbp_topic_title', __( '<strong>Error:</strong> Your review needs a title.', 'wporg-forums' ) ); 396 396 } 397 397 398 398 if ( bbpress()->errors->get_error_message( 'bbp_topic_content' ) ) { 399 399 bbpress()->errors->remove( 'bbp_topic_content' ); 400 bbp_add_error( 'bbp_topic_content', __( '<strong>Error </strong>:Your review cannot be empty.', 'wporg-forums' ) );400 bbp_add_error( 'bbp_topic_content', __( '<strong>Error:</strong> Your review cannot be empty.', 'wporg-forums' ) ); 401 401 } 402 402 } -
sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-stickies-compat.php
r5960 r12012 120 120 // Check for empty topic or term id. 121 121 if ( ! $topic || ! $term ) { 122 bbp_add_error( 'wporg_bbp_sticky_topic_id', __( '<strong>E RROR</strong>:No topic was found! Which topic are you sticking?', 'wporg-forums' ) );122 bbp_add_error( 'wporg_bbp_sticky_topic_id', __( '<strong>Error:</strong> No topic was found! Which topic are you sticking?', 'wporg-forums' ) ); 123 123 124 124 // Check user. 125 125 } elseif ( ! $this->user_can_stick( $user_id, $term->term_id, $topic->ID ) ) { 126 bbp_add_error( 'wporg_bbp_sticky_logged_in', __( '<strong>E RROR</strong>:You do not have permission to do this!', 'wporg-forums' ) );126 bbp_add_error( 'wporg_bbp_sticky_logged_in', __( '<strong>Error:</strong> You do not have permission to do this!', 'wporg-forums' ) ); 127 127 128 128 // Check nonce. 129 129 } elseif( ! bbp_verify_nonce_request( 'toggle-topic-sticky_' . $topic->ID . '_' . $term->term_id ) ) { 130 bbp_add_error( 'wporg_bbp_sticky_nonce', __( '<strong>E RROR</strong>:Are you sure you wanted to do that?', 'wporg-forums' ) );130 bbp_add_error( 'wporg_bbp_sticky_nonce', __( '<strong>Error:</strong> Are you sure you wanted to do that?', 'wporg-forums' ) ); 131 131 } 132 132 … … 150 150 bbp_redirect( $permalink ); 151 151 } elseif ( true === $is_sticky && 'wporg_bbp_stick_compat_topic' == $action ) { 152 bbp_add_error( 'wporg_bbp_stick_compat_topic', __( '<strong>E RROR</strong>:There was a problem sticking that topic!', 'wporg-forums' ) );152 bbp_add_error( 'wporg_bbp_stick_compat_topic', __( '<strong>Error:</strong> There was a problem sticking that topic!', 'wporg-forums' ) ); 153 153 } elseif ( false === $is_sticky && 'wporg_bbp_unstick_compat_topic' == $action ) { 154 bbp_add_error( 'wporg_bbp_unstick_compat_topic', __( '<strong>E RROR</strong>:There was a problem unsticking that topic!', 'wporg-forums' ) );154 bbp_add_error( 'wporg_bbp_unstick_compat_topic', __( '<strong>Error:</strong> There was a problem unsticking that topic!', 'wporg-forums' ) ); 155 155 } 156 156 } -
sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-users.php
r11302 r12012 324 324 is_email_address_unsafe( $_POST['email'] ) 325 325 ) { 326 bbp_add_error( 'bbp_user_email_invalid', __( '<strong>Error </strong>:That email address cannot be used.', 'wporg-forums' ), array( 'form-field' => 'email' ) );326 bbp_add_error( 'bbp_user_email_invalid', __( '<strong>Error:</strong> That email address cannot be used.', 'wporg-forums' ), array( 'form-field' => 'email' ) ); 327 327 328 328 // Override the post variable to ensure that bbPress & core doesn't use it. -
sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-term-subscription/inc/class-plugin.php
r11662 r12012 115 115 if ( $is_subscribed ) { 116 116 $message = sprintf( 117 __( 'You are subscribed to this forum, and will receive emails for future topic activity. <a href="%1$s">Unsubscribe from %2$s .</a>', 'wporg-forums' ),117 __( 'You are subscribed to this forum, and will receive emails for future topic activity. <a href="%1$s">Unsubscribe from %2$s</a>.', 'wporg-forums' ), 118 118 self::get_subscription_url( get_current_user_id(), $term->term_id, $this->taxonomy ), 119 119 esc_html( $term->name ) … … 169 169 170 170 if ( ! $user_id ) { 171 bbp_add_error( 'wporg_bbp_subscribe_invalid_token', __( '<strong>E RROR</strong>:Link expired!', 'wporg-forums' ) );171 bbp_add_error( 'wporg_bbp_subscribe_invalid_token', __( '<strong>Error:</strong> Link expired!', 'wporg-forums' ) ); 172 172 return false; 173 173 } … … 206 206 // Check for empty term id. 207 207 if ( empty( $user_id ) ) { 208 bbp_add_error( 'wporg_bbp_subscribe_logged_id', __( '<strong>E RROR</strong>:You must be logged in to do this!', 'wporg-forums' ) );208 bbp_add_error( 'wporg_bbp_subscribe_logged_id', __( '<strong>Error:</strong> You must be logged in to do this!', 'wporg-forums' ) ); 209 209 210 210 // Check nonce. 211 211 } elseif ( 'token' !== $auth && ! bbp_verify_nonce_request( 'toggle-term-subscription_' . $user_id . '_' . $term_id . '_' . $this->taxonomy ) ) { 212 bbp_add_error( 'wporg_bbp_subscribe_nonce', __( '<strong>E RROR</strong>:Are you sure you wanted to do that?', 'wporg-forums' ) );212 bbp_add_error( 'wporg_bbp_subscribe_nonce', __( '<strong>Error:</strong> Are you sure you wanted to do that?', 'wporg-forums' ) ); 213 213 214 214 // Check user's ability to spectate if attempting to subscribe to a term. 215 215 } elseif ( ! user_can( $user_id, 'spectate' ) && 'wporg_bbp_subscribe_term' === $action ) { 216 bbp_add_error( 'wporg_bbp_subscribe_permissions', __( '<strong>E RROR</strong>:You don\'t have permission to do this!', 'wporg-forums' ) );216 bbp_add_error( 'wporg_bbp_subscribe_permissions', __( '<strong>Error:</strong> You don\'t have permission to do this!', 'wporg-forums' ) ); 217 217 } 218 218 … … 246 246 } elseif ( true === $is_subscribed && 'wporg_bbp_subscribe_term' === $action ) { 247 247 /* translators: Term: topic tag */ 248 bbp_add_error( 'wporg_bbp_subscribe_user', __( '<strong>E RROR</strong>:There was a problem subscribing to that term!', 'wporg-forums' ) );248 bbp_add_error( 'wporg_bbp_subscribe_user', __( '<strong>Error:</strong> There was a problem subscribing to that term!', 'wporg-forums' ) ); 249 249 } elseif ( false === $is_subscribed && 'wporg_bbp_unsubscribe_term' === $action ) { 250 250 /* translators: Term: topic tag */ 251 bbp_add_error( 'wporg_bbp_unsubscribe_user', __( '<strong>E RROR</strong>:There was a problem unsubscribing from that term!', 'wporg-forums' ) );251 bbp_add_error( 'wporg_bbp_unsubscribe_user', __( '<strong>Error:</strong> There was a problem unsubscribing from that term!', 'wporg-forums' ) ); 252 252 } 253 253 } … … 361 361 %4$s 362 362 363 To unsubscribe from future emails click here:363 To unsubscribe from future emails, click here: 364 364 ####UNSUB_LINK####', 'wporg-forums' ), 365 365 $topic_author_name, … … 503 503 %4$s 504 504 505 To unsubscribe from future emails click here:505 To unsubscribe from future emails, click here: 506 506 ####UNSUB_LINK####', 'wporg-forums' ), 507 507 $reply_author_name, -
sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-topic-resolution/inc/class-plugin.php
r9479 r12012 287 287 // Check for empty topic id. 288 288 if ( empty( $topic_id ) || ! $topic ) { 289 bbp_add_error( 'wporg_bbp_topic_resolution_topic_id', __( '<strong>E RROR</strong>:No topic was found!', 'wporg-forums' ) );289 bbp_add_error( 'wporg_bbp_topic_resolution_topic_id', __( '<strong>Error:</strong> No topic was found!', 'wporg-forums' ) ); 290 290 291 291 // Check valid resolution. 292 292 } elseif ( ! $this->is_valid_topic_resolution( $resolution ) ) { 293 bbp_add_error( 'wporg_bbp_topic_resolution_invalid', __( '<strong>E RROR</strong>:That is not a valid topic resolution!', 'wporg-forums' ) );293 bbp_add_error( 'wporg_bbp_topic_resolution_invalid', __( '<strong>Error:</strong> That is not a valid topic resolution!', 'wporg-forums' ) ); 294 294 295 295 // Check user permissions. 296 296 } elseif ( ! $this->user_can_resolve( $user_id, $topic->ID ) ) { 297 bbp_add_error( 'wporg_bbp_topic_resolution_permissions', __( '<strong>E RROR</strong>:You don\'t have permission to do this!', 'wporg-forums' ) );297 bbp_add_error( 'wporg_bbp_topic_resolution_permissions', __( '<strong>Error:</strong> You don\'t have permission to do this!', 'wporg-forums' ) ); 298 298 299 299 // Check nonce. 300 300 } elseif ( ! bbp_verify_nonce_request( 'toggle-topic-resolution_' . $topic->ID ) ) { 301 bbp_add_error( 'wporg_bbp_topic_resolution_nonce', __( '<strong>E RROR</strong>:Are you sure you wanted to do that?', 'wporg-forums' ) );301 bbp_add_error( 'wporg_bbp_topic_resolution_nonce', __( '<strong>Error:</strong> Are you sure you wanted to do that?', 'wporg-forums' ) ); 302 302 } 303 303 -
sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-user-moderation/inc/class-plugin.php
r8117 r12012 183 183 $post = get_post( $post_id ); 184 184 if ( ! $post ) { 185 bbp_add_error( 'wporg_bbp_flag_post_id', __( '<strong>E RROR</strong>:No post was found! Which topic or reply are you marking for moderation?', 'wporg-forums' ) );185 bbp_add_error( 'wporg_bbp_flag_post_id', __( '<strong>Error:</strong> No post was found! Which topic or reply are you marking for moderation?', 'wporg-forums' ) ); 186 186 187 187 // Check that user id matches post author 188 188 } elseif ( $post->post_author != intval( $_GET['user_id'] ) ) { 189 bbp_add_error( 'wporg_bbp_flag_post_user', __( '<strong>E RROR</strong>:That author does not match the flagged post.', 'wporg-forums' ) );189 bbp_add_error( 'wporg_bbp_flag_post_user', __( '<strong>Error:</strong> That author does not match the flagged post.', 'wporg-forums' ) ); 190 190 191 191 // Check nonce 192 192 } elseif ( ! bbp_verify_nonce_request( 'toggle-flag_' . $post->post_author . '_' . $post->ID ) ) { 193 bbp_add_error( 'wporg_bbp_flag_nonce', __( '<strong>E RROR</strong>:Are you sure you wanted to do that?', 'wporg-forums' ) );193 bbp_add_error( 'wporg_bbp_flag_nonce', __( '<strong>Error:</strong> Are you sure you wanted to do that?', 'wporg-forums' ) ); 194 194 195 195 // Check current user's ability to moderate 196 196 } elseif ( ! current_user_can( 'moderate' ) ) { 197 bbp_add_error( 'wporg_bbp_flag_permissions', __( '<strong>E RROR</strong>:You don\'t have permission to moderate that user!', 'wporg-forums' ) );197 bbp_add_error( 'wporg_bbp_flag_permissions', __( '<strong>Error:</strong> You don\'t have permission to moderate that user!', 'wporg-forums' ) ); 198 198 } 199 199 … … 218 218 bbp_redirect( $redirect ); 219 219 } elseif ( true === $is_flagged && 'bbp_flag_user' === $action ) { 220 bbp_add_error( 'wporg_bbp_flag_user', __( '<strong>E RROR</strong>:There was a problem flagging that user!', 'wporg-forums' ) );220 bbp_add_error( 'wporg_bbp_flag_user', __( '<strong>Error:</strong> There was a problem flagging that user!', 'wporg-forums' ) ); 221 221 } elseif ( false === $is_flagged && 'bbp_unflag_user' == $action ) { 222 bbp_add_error( 'wporg_bbp_flag_unuser', __( '<strong>E RROR</strong>:There was a problem unflagging that user!', 'wporg-forums' ) );222 bbp_add_error( 'wporg_bbp_flag_unuser', __( '<strong>Error:</strong> There was a problem unflagging that user!', 'wporg-forums' ) ); 223 223 } 224 224 }
Note: See TracChangeset
for help on using the changeset viewer.