Changeset 3739
- Timestamp:
- 07/29/2016 10:44:47 AM (9 years ago)
- Location:
- sites/trunk/wordpress.org/public_html/wp-content/plugins
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-term-subscription/inc/class-plugin.php
r3719 r3739 79 79 80 80 // Get required data. 81 $user_id = get_current_user_id(); 81 $user_id = get_current_user_id(); 82 82 $term_id = intval( $_GET['term_id'] ); 83 83 $term = get_term( $term_id ); … … 85 85 // Check for empty term id. 86 86 if ( ! $term ) { 87 bbp_add_error( 'wporg_bbp_subscribe_term_id', __( '<strong>ERROR</strong>: No term was found! Which term are you subscribing/unsubscribing to?', 'wporg ' ) );87 bbp_add_error( 'wporg_bbp_subscribe_term_id', __( '<strong>ERROR</strong>: No term was found! Which term are you subscribing/unsubscribing to?', 'wporg-forums' ) ); 88 88 89 89 // Check for current user. 90 90 } elseif ( empty( $user_id ) ) { 91 bbp_add_error( 'wporg_bbp_subscribe_logged_id', __( '<strong>ERROR</strong>: You must be logged in to do this!', 'wporg ' ) );91 bbp_add_error( 'wporg_bbp_subscribe_logged_id', __( '<strong>ERROR</strong>: You must be logged in to do this!', 'wporg-forums' ) ); 92 92 93 93 // Check nonce. 94 94 } elseif ( ! bbp_verify_nonce_request( 'toggle-term-subscription_' . $user_id . '_' . $term_id ) ) { 95 bbp_add_error( 'wporg_bbp_subscribe_nonce', __( '<strong>ERROR</strong>: Are you sure you wanted to do that?', 'wporg ' ) );95 bbp_add_error( 'wporg_bbp_subscribe_nonce', __( '<strong>ERROR</strong>: Are you sure you wanted to do that?', 'wporg-forums' ) ); 96 96 97 97 // Check current user's ability to spectate. 98 98 } elseif ( ! current_user_can( 'spectate' ) ) { 99 bbp_add_error( 'wporg_bbp_subscribe_permissions', __( '<strong>ERROR</strong>: You don\'t have permission to do this!', 'wporg ' ) );99 bbp_add_error( 'wporg_bbp_subscribe_permissions', __( '<strong>ERROR</strong>: You don\'t have permission to do this!', 'wporg-forums' ) ); 100 100 } 101 101 … … 118 118 bbp_redirect( $redirect ); 119 119 } elseif ( true === $is_subscribed && 'wporg_bbp_subscribe_term' === $action ) { 120 bbp_add_error( 'wporg_bbp_subscribe_user', __( '<strong>ERROR</strong>: There was a problem subscribing to that term!', 'wporg ' ) );120 bbp_add_error( 'wporg_bbp_subscribe_user', __( '<strong>ERROR</strong>: There was a problem subscribing to that term!', 'wporg-forums' ) ); 121 121 } elseif ( false === $is_subscribed && 'wporg_bbp_unsubscribe_term' === $action ) { 122 bbp_add_error( 'wporg_bbp_unsubscribe_user', __( '<strong>ERROR</strong>: There was a problem unsubscribing from that term!', 'wporg ' ) );122 bbp_add_error( 'wporg_bbp_unsubscribe_user', __( '<strong>ERROR</strong>: There was a problem unsubscribing from that term!', 'wporg-forums' ) ); 123 123 } 124 124 } … … 206 206 You are receiving this email because you subscribed to a topic tag. 207 207 208 Login and visit the topic to unsubscribe from these emails.', 'wporg ' ),208 Login and visit the topic to unsubscribe from these emails.', 'wporg-forums' ), 209 209 $topic_author_name, 210 210 $topic_content, … … 297 297 You are receiving this email because you subscribed to a topic tag. 298 298 299 Login and visit the topic to unsubscribe from these emails.', 'wporg ' ),299 Login and visit the topic to unsubscribe from these emails.', 'wporg-forums' ), 300 300 $reply_author_name, 301 301 $reply_content, … … 376 376 * @param $user_id int The user id 377 377 * @param $term_id int The term id 378 * @return bool False if invalid, otherwise true 378 * @return bool False if invalid, otherwise true 379 379 */ 380 380 public static function add_user_subscription( $user_id = 0, $term_id = 0 ) { … … 384 384 385 385 if ( ! self::is_user_subscribed_to_term( $user_id, $term_id ) ) { 386 add_term_meta( $term_id, self::META_KEY, $user_id ); 386 add_term_meta( $term_id, self::META_KEY, $user_id ); 387 387 wp_cache_delete( 'wporg_bbp_get_term_subscribers_' . $term_id, 'bbpress_users' ); 388 388 } … … 429 429 'user_id' => get_current_user_id(), 430 430 'term_id' => 0, 431 'subscribe' => esc_html__( 'Subscribe to this topic tag', 'wporg ' ),432 'unsubscribe' => esc_html__( 'Unsubscribe from this topic tag', 'wporg ' ),431 'subscribe' => esc_html__( 'Subscribe to this topic tag', 'wporg-forums' ), 432 'unsubscribe' => esc_html__( 'Unsubscribe from this topic tag', 'wporg-forums' ), 433 433 ), 'get_term_subscription_link' ); 434 434 if ( empty( $r['user_id'] ) || empty( $r['term_id'] ) ) { -
sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-topic-resolution/inc/class-plugin.php
r3738 r3739 65 65 */ 66 66 public function get_topic_title( $title, $topic_id ) { 67 $resolved = __( 'Resolved', 'wporg ' );67 $resolved = __( 'Resolved', 'wporg-forums' ); 68 68 if ( 'yes' == $this->get_topic_resolution( array( 'id' => $topic_id ) ) ) { 69 69 return sprintf( esc_html( '[%s]: %s' ), $resolved, $title ); … … 101 101 } 102 102 ?> 103 <p><label for="topic-resolved"><?php esc_html_e( 'This topic is', 'wporg ' ); ?></label><br />103 <p><label for="topic-resolved"><?php esc_html_e( 'This topic is', 'wporg-forums' ); ?></label><br /> 104 104 105 105 <select name="<?php echo esc_attr( self::META_KEY ); ?>" id="topic-resolved"> … … 129 129 } 130 130 ?> 131 <p><label for="topic-resolved"><input type="checkbox" name="<?php echo esc_attr( self::META_KEY ); ?>" id="topic-resolved" value="mu"> <?php esc_html_e( 'This topic is not a support question', 'wporg ' ); ?></label></p>131 <p><label for="topic-resolved"><input type="checkbox" name="<?php echo esc_attr( self::META_KEY ); ?>" id="topic-resolved" value="mu"> <?php esc_html_e( 'This topic is not a support question', 'wporg-forums' ); ?></label></p> 132 132 <?php 133 133 } … … 155 155 public function add_forum_topic_resolution_column( $columns ) { 156 156 return array_merge( $columns, array( 157 'bbp_topic_resolution' => __( 'Support', 'wporg ' ),157 'bbp_topic_resolution' => __( 'Support', 'wporg-forums' ), 158 158 ) ); 159 159 } … … 260 260 public function get_topic_resolutions() { 261 261 return apply_filters( 'wporg_bbp_get_topic_resolutions', array( 262 'no' => __( 'not resolved', 'wporg ' ),263 'yes' => __( 'resolved', 'wporg ' ),264 'mu' => __( 'not a support question', 'wporg ' ),262 'no' => __( 'not resolved', 'wporg-forums' ), 263 'yes' => __( 'resolved', 'wporg-forums' ), 264 'mu' => __( 'not a support question', 'wporg-forums' ), 265 265 ) ); 266 266 } -
sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-user-moderation/inc/class-plugin.php
r3702 r3739 170 170 $post = get_post( $post_id ); 171 171 if ( ! $post ) { 172 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 ' ) );172 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' ) ); 173 173 174 174 // Check that user id matches post author 175 175 } elseif ( $post->post_author != intval( $_GET['user_id'] ) ) { 176 bbp_add_error( 'wporg_bbp_flag_post_user', __( '<strong>ERROR</strong>: That author does not match the flagged post.', 'wporg ' ) );176 bbp_add_error( 'wporg_bbp_flag_post_user', __( '<strong>ERROR</strong>: That author does not match the flagged post.', 'wporg-forums' ) ); 177 177 178 178 // Check nonce 179 179 } elseif ( ! bbp_verify_nonce_request( 'toggle-flag_' . $post->post_author . '_' . $post->ID ) ) { 180 bbp_add_error( 'wporg_bbp_flag_nonce', __( '<strong>ERROR</strong>: Are you sure you wanted to do that?', 'wporg ' ) );180 bbp_add_error( 'wporg_bbp_flag_nonce', __( '<strong>ERROR</strong>: Are you sure you wanted to do that?', 'wporg-forums' ) ); 181 181 182 182 // Check current user's ability to moderate 183 183 } elseif ( ! current_user_can( 'moderate' ) ) { 184 bbp_add_error( 'wporg_bbp_flag_permissions', __( '<strong>ERROR</strong>: You don\'t have permission to moderate that user!', 'wporg ' ) );184 bbp_add_error( 'wporg_bbp_flag_permissions', __( '<strong>ERROR</strong>: You don\'t have permission to moderate that user!', 'wporg-forums' ) ); 185 185 } 186 186 … … 205 205 bbp_redirect( $redirect ); 206 206 } elseif ( true === $is_flagged && 'bbp_flag_user' === $action ) { 207 bbp_add_error( 'wporg_bbp_flag_user', __( '<strong>ERROR</strong>: There was a problem flagging that user!', 'wporg ' ) );207 bbp_add_error( 'wporg_bbp_flag_user', __( '<strong>ERROR</strong>: There was a problem flagging that user!', 'wporg-forums' ) ); 208 208 } elseif ( false === $is_flagged && 'bbp_unflag_user' == $action ) { 209 bbp_add_error( 'wporg_bbp_flag_unuser', __( '<strong>ERROR</strong>: There was a problem unflagging that user!', 'wporg ' ) );209 bbp_add_error( 'wporg_bbp_flag_unuser', __( '<strong>ERROR</strong>: There was a problem unflagging that user!', 'wporg-forums' ) ); 210 210 } 211 211 } … … 256 256 'user_id' => bbp_get_displayed_user_id(), 257 257 'post_id' => 0, 258 'flag' => esc_html__( 'Flag Author', 'wporg ' ),259 'unflag' => esc_html__( 'Unflag Author', 'wporg ' ),258 'flag' => esc_html__( 'Flag Author', 'wporg-forums' ), 259 'unflag' => esc_html__( 'Unflag Author', 'wporg-forums' ), 260 260 ), 'get_user_flag_link' ); 261 261 -
sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-version-dropdown/inc/class-plugin.php
r3737 r3739 77 77 ?> 78 78 <p> 79 <label for="wp-version"><?php esc_html_e( 'Version:', 'wporg ' ); ?></label><br />80 <em><?php esc_html_e( 'Select the version of WordPress you are using.', 'wporg ' ); ?></em><br />79 <label for="wp-version"><?php esc_html_e( 'Version:', 'wporg-forums' ); ?></label><br /> 80 <em><?php esc_html_e( 'Select the version of WordPress you are using.', 'wporg-forums' ); ?></em><br /> 81 81 82 82 <select name="<?php echo esc_attr( self::META_KEY ); ?>" id="wp-version"> … … 86 86 </select> 87 87 88 <label for="wp-other-version"><?php esc_html_e( 'Enter a different WordPress version here:', 'wporg ' ); ?></label>88 <label for="wp-other-version"><?php esc_html_e( 'Enter a different WordPress version here:', 'wporg-forums' ); ?></label> 89 89 <input type="text" name="wp_other_version" id="wp-other-version" value="<?php echo esc_attr( $other_version ); ?>"> 90 90 </p> … … 111 111 public function enqueue_scripts() { 112 112 if ( bbp_is_single_forum() || bbp_is_single_topic() || bbp_is_topic_edit() ) { 113 wp_enqueue_script( 'wporg-bbp-version-dropdown', plugins_url( 'wporg-bbp-version-dropdown.js', dirname( __FILE__ ) ), array( 'jquery' ));113 wp_enqueue_script( 'wporg-bbp-version-dropdown', plugins_url( 'wporg-bbp-version-dropdown.js', __DIR__ ), array( 'jquery' ), '20160729', true ); 114 114 } 115 115 } … … 157 157 array( '0' => '' ), 158 158 apply_filters( 'wporg_bbp_get_wp_versions', array() ), 159 array( 'other' => __( 'Other:', 'wporg ' ) )159 array( 'other' => __( 'Other:', 'wporg-forums' ) ) 160 160 ); 161 161 return $versions;
Note: See TracChangeset
for help on using the changeset viewer.