Changeset 6141
- Timestamp:
- 12/08/2016 04:14:17 PM (3 years ago)
- Location:
- trunk/src
- Files:
-
- 17 edited
-
includes/admin/forums.php (modified) (1 diff)
-
includes/admin/replies.php (modified) (1 diff)
-
includes/admin/tools.php (modified) (1 diff)
-
includes/admin/topics.php (modified) (1 diff)
-
includes/common/functions.php (modified) (1 diff)
-
includes/extend/buddypress/notifications.php (modified) (1 diff)
-
includes/forums/functions.php (modified) (2 diffs)
-
includes/replies/functions.php (modified) (13 diffs)
-
includes/topics/functions.php (modified) (13 diffs)
-
includes/users/functions.php (modified) (9 diffs)
-
templates/default/bbpress/feedback-no-forums.php (modified) (1 diff)
-
templates/default/bbpress/feedback-no-replies.php (modified) (1 diff)
-
templates/default/bbpress/feedback-no-search.php (modified) (1 diff)
-
templates/default/bbpress/feedback-no-topics.php (modified) (1 diff)
-
templates/default/bbpress/form-reply-move.php (modified) (1 diff)
-
templates/default/bbpress/form-topic-merge.php (modified) (1 diff)
-
templates/default/bbpress/form-topic-split.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/includes/admin/forums.php
r6140 r6141 493 493 // Bail if forum is missing 494 494 if ( empty( $forum ) ) { 495 wp_die( __( 'The forum was not found !', 'bbpress' ) );495 wp_die( __( 'The forum was not found.', 'bbpress' ) ); 496 496 } 497 497 498 498 // What is the user doing here? 499 499 if ( ! current_user_can( 'keep_gate', $forum->ID ) ) { 500 wp_die( __( 'You do not have thepermission to do that.', 'bbpress' ) );500 wp_die( __( 'You do not have permission to do that.', 'bbpress' ) ); 501 501 } 502 502 -
trunk/src/includes/admin/replies.php
r6140 r6141 604 604 $reply = bbp_get_reply( $reply_id ); 605 605 if ( empty( $reply ) ) { 606 wp_die( __( 'The reply was not found !', 'bbpress' ) );606 wp_die( __( 'The reply was not found.', 'bbpress' ) ); 607 607 } 608 608 609 609 // What is the user doing here? 610 610 if ( !current_user_can( 'moderate', $reply->ID ) ) { 611 wp_die( __( 'You do not have thepermission to do that.', 'bbpress' ) );611 wp_die( __( 'You do not have permission to do that.', 'bbpress' ) ); 612 612 } 613 613 -
trunk/src/includes/admin/tools.php
r6091 r6141 2081 2081 $bbp_db = bbp_db(); 2082 2082 $statement = __( 'Recalculating reply menu order … %s', 'bbpress' ); 2083 $result = __( 'No reply positions to recalculate !', 'bbpress' );2083 $result = __( 'No reply positions to recalculate.', 'bbpress' ); 2084 2084 2085 2085 // Delete cases where `_bbp_reply_to` was accidentally set to itself -
trunk/src/includes/admin/topics.php
r6140 r6141 655 655 // Bail if topic is missing 656 656 if ( empty( $topic ) ) { 657 wp_die( __( 'The topic was not found !', 'bbpress' ) );657 wp_die( __( 'The topic was not found.', 'bbpress' ) ); 658 658 } 659 659 660 660 // What is the user doing here? 661 661 if ( !current_user_can( 'moderate', $topic->ID ) ) { 662 wp_die( __( 'You do not have thepermission to do that.', 'bbpress' ) );662 wp_die( __( 'You do not have permission to do that.', 'bbpress' ) ); 663 663 } 664 664 -
trunk/src/includes/common/functions.php
r6135 r6141 651 651 $r['bbp_anonymous_name'] = apply_filters( 'bbp_pre_anonymous_post_author_name', $r['bbp_anonymous_name'] ); 652 652 if ( empty( $r['bbp_anonymous_name'] ) ) { 653 bbp_add_error( 'bbp_anonymous_name', __( '<strong>ERROR</strong>: Invalid author name submitted!', 'bbpress' ) );653 bbp_add_error( 'bbp_anonymous_name', __( '<strong>ERROR</strong>: Invalid author name.', 'bbpress' ) ); 654 654 } 655 655 656 656 $r['bbp_anonymous_email'] = apply_filters( 'bbp_pre_anonymous_post_author_email', $r['bbp_anonymous_email'] ); 657 657 if ( empty( $r['bbp_anonymous_email'] ) ) { 658 bbp_add_error( 'bbp_anonymous_email', __( '<strong>ERROR</strong>: Invalid email address submitted!', 'bbpress' ) );658 bbp_add_error( 'bbp_anonymous_email', __( '<strong>ERROR</strong>: Invalid email address.', 'bbpress' ) ); 659 659 } 660 660 -
trunk/src/includes/extend/buddypress/notifications.php
r5951 r6141 166 166 // Check current user's ability to edit the user 167 167 } elseif ( !current_user_can( 'edit_user', $user_id ) ) { 168 bbp_add_error( 'bbp_notification_permission s', __( '<strong>ERROR</strong>: You do not have permission to mark notifications for that user.', 'bbpress' ) );168 bbp_add_error( 'bbp_notification_permission', __( '<strong>ERROR</strong>: You do not have permission to mark notifications for that user.', 'bbpress' ) ); 169 169 } 170 170 -
trunk/src/includes/forums/functions.php
r6135 r6141 143 143 // User cannot create forums 144 144 if ( !current_user_can( 'publish_forums' ) ) { 145 bbp_add_error( 'bbp_forum_permission s', __( '<strong>ERROR</strong>: You do not have permission to create new forums.', 'bbpress' ) );145 bbp_add_error( 'bbp_forum_permission', __( '<strong>ERROR</strong>: You do not have permission to create new forums.', 'bbpress' ) ); 146 146 return; 147 147 } … … 423 423 // User cannot edit this forum 424 424 } elseif ( !current_user_can( 'edit_forum', $forum_id ) ) { 425 bbp_add_error( 'bbp_edit_forum_permission s', __( '<strong>ERROR</strong>: You do not have permission to edit that forum.', 'bbpress' ) );425 bbp_add_error( 'bbp_edit_forum_permission', __( '<strong>ERROR</strong>: You do not have permission to edit that forum.', 'bbpress' ) ); 426 426 return; 427 427 } -
trunk/src/includes/replies/functions.php
r6140 r6141 180 180 // User cannot create replies 181 181 if ( !current_user_can( 'publish_replies' ) ) { 182 bbp_add_error( 'bbp_reply_permission s', __( '<strong>ERROR</strong>: You do not have permission to reply.', 'bbpress' ) );182 bbp_add_error( 'bbp_reply_permission', __( '<strong>ERROR</strong>: You do not have permission to reply.', 'bbpress' ) ); 183 183 } 184 184 … … 573 573 // User cannot edit this reply 574 574 if ( !current_user_can( 'edit_reply', $reply_id ) ) { 575 bbp_add_error( 'bbp_edit_reply_permission s', __( '<strong>ERROR</strong>: You do not have permission to edit that reply.', 'bbpress' ) );575 bbp_add_error( 'bbp_edit_reply_permission', __( '<strong>ERROR</strong>: You do not have permission to edit that reply.', 'bbpress' ) ); 576 576 return; 577 577 } … … 1331 1331 1332 1332 if ( empty( $_POST['bbp_reply_id'] ) ) { 1333 bbp_add_error( 'bbp_move_reply_reply_id', __( '<strong>ERROR</strong>: Reply ID to move not found!', 'bbpress' ) );1333 bbp_add_error( 'bbp_move_reply_reply_id', __( '<strong>ERROR</strong>: A reply ID is required', 'bbpress' ) ); 1334 1334 } else { 1335 1335 $move_reply_id = (int) $_POST['bbp_reply_id']; … … 1361 1361 // Use cannot edit topic 1362 1362 if ( !current_user_can( 'edit_topic', $source_topic->ID ) ) { 1363 bbp_add_error( 'bbp_move_reply_source_permission', __( '<strong>ERROR</strong>: You do not have the permissionsto edit the source topic.', 'bbpress' ) );1363 bbp_add_error( 'bbp_move_reply_source_permission', __( '<strong>ERROR</strong>: You do not have permission to edit the source topic.', 'bbpress' ) ); 1364 1364 } 1365 1365 … … 1384 1384 // Get destination topic id 1385 1385 if ( empty( $_POST['bbp_destination_topic'] ) ) { 1386 bbp_add_error( 'bbp_move_reply_destination_id', __( '<strong>ERROR</strong>: Destination topic ID not found!', 'bbpress' ) );1386 bbp_add_error( 'bbp_move_reply_destination_id', __( '<strong>ERROR</strong>: A topic ID is required.', 'bbpress' ) ); 1387 1387 } else { 1388 1388 $destination_topic_id = (int) $_POST['bbp_destination_topic']; … … 1394 1394 // No destination topic 1395 1395 if ( empty( $destination_topic ) ) { 1396 bbp_add_error( 'bbp_move_reply_destination_not_found', __( '<strong>ERROR</strong>: The topic you want to move to was not found !', 'bbpress' ) );1396 bbp_add_error( 'bbp_move_reply_destination_not_found', __( '<strong>ERROR</strong>: The topic you want to move to was not found.', 'bbpress' ) ); 1397 1397 } 1398 1398 1399 1399 // User cannot edit the destination topic 1400 1400 if ( !current_user_can( 'edit_topic', $destination_topic->ID ) ) { 1401 bbp_add_error( 'bbp_move_reply_destination_permission', __( '<strong>ERROR</strong>: You do not have the permissions to edit the destination topic!', 'bbpress' ) );1401 bbp_add_error( 'bbp_move_reply_destination_permission', __( '<strong>ERROR</strong>: You do not have permission to edit the destination topic.', 'bbpress' ) ); 1402 1402 } 1403 1403 … … 1458 1458 // User cannot publish posts 1459 1459 } else { 1460 bbp_add_error( 'bbp_move_reply_destination_permission', __( '<strong>ERROR</strong>: You do not have the permissionsto create new topics. The reply could not be converted into a topic.', 'bbpress' ) );1460 bbp_add_error( 'bbp_move_reply_destination_permission', __( '<strong>ERROR</strong>: You do not have permission to create new topics. The reply could not be converted into a topic.', 'bbpress' ) ); 1461 1461 } 1462 1462 … … 1636 1636 // What is the user doing here? 1637 1637 if ( ! current_user_can( 'edit_reply', $reply_id ) || ( 'bbp_toggle_reply_trash' === $action && ! current_user_can( 'delete_reply', $reply_id ) ) ) { 1638 bbp_add_error( 'bbp_toggle_reply_permission', __( '<strong>ERROR:</strong> You do not have thepermission to do that.', 'bbpress' ) );1638 bbp_add_error( 'bbp_toggle_reply_permission', __( '<strong>ERROR:</strong> You do not have permission to do that.', 'bbpress' ) ); 1639 1639 return; 1640 1640 } … … 1712 1712 $is_approve = bbp_is_reply_pending( $r['id'] ); 1713 1713 $retval['status'] = $is_approve ? bbp_approve_reply( $r['id'] ) : bbp_unapprove_reply( $r['id'] ); 1714 $retval['message'] = $is_approve ? __( '<strong>ERROR</strong>: There was a problem approving the reply !', 'bbpress' ) : __( '<strong>ERROR</strong>: There was a problem unapproving the reply!', 'bbpress' );1714 $retval['message'] = $is_approve ? __( '<strong>ERROR</strong>: There was a problem approving the reply.', 'bbpress' ) : __( '<strong>ERROR</strong>: There was a problem unapproving the reply.', 'bbpress' ); 1715 1715 $retval['view_all'] = ! $is_approve; 1716 1716 … … 1723 1723 $is_spam = bbp_is_reply_spam( $r['id'] ); 1724 1724 $retval['status'] = $is_spam ? bbp_unspam_reply( $r['id'] ) : bbp_spam_reply( $r['id'] ); 1725 $retval['message'] = $is_spam ? __( '<strong>ERROR</strong>: There was a problem unmarking the reply as spam !', 'bbpress' ) : __( '<strong>ERROR</strong>: There was a problem marking the reply as spam!', 'bbpress' );1725 $retval['message'] = $is_spam ? __( '<strong>ERROR</strong>: There was a problem unmarking the reply as spam.', 'bbpress' ) : __( '<strong>ERROR</strong>: There was a problem marking the reply as spam.', 'bbpress' ); 1726 1726 $retval['view_all'] = ! $is_spam; 1727 1727 … … 1738 1738 $retval['view_all'] = true; 1739 1739 $retval['status'] = wp_trash_post( $r['id'] ); 1740 $retval['message'] = __( '<strong>ERROR</strong>: There was a problem trashing the reply !', 'bbpress' );1740 $retval['message'] = __( '<strong>ERROR</strong>: There was a problem trashing the reply.', 'bbpress' ); 1741 1741 1742 1742 break; … … 1746 1746 1747 1747 $retval['status'] = wp_untrash_post( $r['id'] ); 1748 $retval['message'] = __( '<strong>ERROR</strong>: There was a problem untrashing the reply !', 'bbpress' );1748 $retval['message'] = __( '<strong>ERROR</strong>: There was a problem untrashing the reply.', 'bbpress' ); 1749 1749 1750 1750 break; … … 1754 1754 1755 1755 $retval['status'] = wp_delete_post( $r['id'] ); 1756 $retval['message'] = __( '<strong>ERROR</strong>: There was a problem deleting the reply !', 'bbpress' );1756 $retval['message'] = __( '<strong>ERROR</strong>: There was a problem deleting the reply.', 'bbpress' ); 1757 1757 1758 1758 break; -
trunk/src/includes/topics/functions.php
r6140 r6141 163 163 // User cannot create topics 164 164 if ( ! current_user_can( 'publish_topics' ) ) { 165 bbp_add_error( 'bbp_topic_permission s', __( '<strong>ERROR</strong>: You do not have permission to create new topics.', 'bbpress' ) );165 bbp_add_error( 'bbp_topic_permission', __( '<strong>ERROR</strong>: You do not have permission to create new topics.', 'bbpress' ) ); 166 166 return; 167 167 } … … 505 505 // User cannot edit this topic 506 506 if ( ! current_user_can( 'edit_topic', $topic_id ) ) { 507 bbp_add_error( 'bbp_edit_topic_permission s', __( '<strong>ERROR</strong>: You do not have permission to edit that topic.', 'bbpress' ) );507 bbp_add_error( 'bbp_edit_topic_permission', __( '<strong>ERROR</strong>: You do not have permission to edit that topic.', 'bbpress' ) ); 508 508 } 509 509 … … 1233 1233 // Cannot edit source topic 1234 1234 if ( ! current_user_can( 'edit_topic', $source_topic->ID ) ) { 1235 bbp_add_error( 'bbp_merge_topic_source_permission', __( '<strong>ERROR</strong>: You do not have the permissionsto edit the source topic.', 'bbpress' ) );1235 bbp_add_error( 'bbp_merge_topic_source_permission', __( '<strong>ERROR</strong>: You do not have permission to edit the source topic.', 'bbpress' ) ); 1236 1236 return; 1237 1237 } … … 1253 1253 // Cannot edit destination topic 1254 1254 if ( ! current_user_can( 'edit_topic', $destination_topic->ID ) ) { 1255 bbp_add_error( 'bbp_merge_topic_destination_permission', __( '<strong>ERROR</strong>: You do not have the permissionsto edit the destination topic.', 'bbpress' ) );1255 bbp_add_error( 'bbp_merge_topic_destination_permission', __( '<strong>ERROR</strong>: You do not have permission to edit the destination topic.', 'bbpress' ) ); 1256 1256 } 1257 1257 … … 1512 1512 1513 1513 if ( empty( $_POST['bbp_reply_id'] ) ) { 1514 bbp_add_error( 'bbp_split_topic_reply_id', __( '<strong>ERROR</strong>: Reply ID to split the topic from not found!', 'bbpress' ) );1514 bbp_add_error( 'bbp_split_topic_reply_id', __( '<strong>ERROR</strong>: A reply ID is required.', 'bbpress' ) ); 1515 1515 } else { 1516 1516 $from_reply_id = (int) $_POST['bbp_reply_id']; … … 1542 1542 // Use cannot edit topic 1543 1543 if ( ! current_user_can( 'edit_topic', $source_topic->ID ) ) { 1544 bbp_add_error( 'bbp_split_topic_source_permission', __( '<strong>ERROR</strong>: You do not have the permissionsto edit the source topic.', 'bbpress' ) );1544 bbp_add_error( 'bbp_split_topic_source_permission', __( '<strong>ERROR</strong>: You do not have permission to edit the source topic.', 'bbpress' ) ); 1545 1545 } 1546 1546 … … 1565 1565 // Get destination topic id 1566 1566 if ( empty( $_POST['bbp_destination_topic'] ) ) { 1567 bbp_add_error( 'bbp_split_topic_destination_id', __( '<strong>ERROR</strong>: Destination topic ID not found!', 'bbpress' ) );1567 bbp_add_error( 'bbp_split_topic_destination_id', __( '<strong>ERROR</strong>: A topic ID is required.', 'bbpress' ) ); 1568 1568 } else { 1569 1569 $destination_topic_id = (int) $_POST['bbp_destination_topic']; … … 1575 1575 // No destination topic 1576 1576 if ( empty( $destination_topic ) ) { 1577 bbp_add_error( 'bbp_split_topic_destination_not_found', __( '<strong>ERROR</strong>: The topic you want to split to was not found !', 'bbpress' ) );1577 bbp_add_error( 'bbp_split_topic_destination_not_found', __( '<strong>ERROR</strong>: The topic you want to split to was not found.', 'bbpress' ) ); 1578 1578 } 1579 1579 1580 1580 // User cannot edit the destination topic 1581 1581 if ( ! current_user_can( 'edit_topic', $destination_topic->ID ) ) { 1582 bbp_add_error( 'bbp_split_topic_destination_permission', __( '<strong>ERROR</strong>: You do not have the permissions to edit the destination topic!', 'bbpress' ) );1582 bbp_add_error( 'bbp_split_topic_destination_permission', __( '<strong>ERROR</strong>: You do not have permission to edit the destination topic.', 'bbpress' ) ); 1583 1583 } 1584 1584 … … 1623 1623 // User cannot publish posts 1624 1624 } else { 1625 bbp_add_error( 'bbp_split_topic_destination_permission', __( '<strong>ERROR</strong>: You do not have the permissionsto create new topics. The reply could not be converted into a topic.', 'bbpress' ) );1625 bbp_add_error( 'bbp_split_topic_destination_permission', __( '<strong>ERROR</strong>: You do not have permission to create new topics. The reply could not be converted into a topic.', 'bbpress' ) ); 1626 1626 } 1627 1627 … … 1898 1898 // Can user edit topic tags? 1899 1899 if ( ! current_user_can( 'edit_topic_tags' ) ) { 1900 bbp_add_error( 'bbp_manage_topic_tag_update_permission s', __( '<strong>ERROR</strong>: You do not have the permissionsto edit the topic tags.', 'bbpress' ) );1900 bbp_add_error( 'bbp_manage_topic_tag_update_permission', __( '<strong>ERROR</strong>: You do not have permission to edit the topic tags.', 'bbpress' ) ); 1901 1901 return; 1902 1902 } … … 1938 1938 // Can user edit topic tags? 1939 1939 if ( ! current_user_can( 'edit_topic_tags' ) ) { 1940 bbp_add_error( 'bbp_manage_topic_tag_merge_permission s', __( '<strong>ERROR</strong>: You do not have the permissionsto edit the topic tags.', 'bbpress' ) );1940 bbp_add_error( 'bbp_manage_topic_tag_merge_permission', __( '<strong>ERROR</strong>: You do not have permission to edit the topic tags.', 'bbpress' ) ); 1941 1941 return; 1942 1942 } … … 1996 1996 // Can user delete topic tags? 1997 1997 if ( ! current_user_can( 'delete_topic_tags' ) ) { 1998 bbp_add_error( 'bbp_manage_topic_tag_delete_permission s', __( '<strong>ERROR</strong>: You do not have the permissionsto delete the topic tags.', 'bbpress' ) );1998 bbp_add_error( 'bbp_manage_topic_tag_delete_permission', __( '<strong>ERROR</strong>: You do not have permission to delete the topic tags.', 'bbpress' ) ); 1999 1999 return; 2000 2000 } … … 2168 2168 // What is the user doing here? 2169 2169 if ( ! current_user_can( 'edit_topic', $topic->ID ) || ( 'bbp_toggle_topic_trash' === $action && ! current_user_can( 'delete_topic', $topic->ID ) ) ) { 2170 bbp_add_error( 'bbp_toggle_topic_permission', __( '<strong>ERROR:</strong> You do not have thepermission to do that.', 'bbpress' ) );2170 bbp_add_error( 'bbp_toggle_topic_permission', __( '<strong>ERROR:</strong> You do not have permission to do that.', 'bbpress' ) ); 2171 2171 return; 2172 2172 } -
trunk/src/includes/users/functions.php
r6114 r6141 496 496 // Check for empty topic 497 497 if ( empty( $topic_id ) ) { 498 bbp_add_error( 'bbp_favorite_topic_id', __( '<strong>ERROR</strong>: No topic was found !Which topic are you marking/unmarking as favorite?', 'bbpress' ) );498 bbp_add_error( 'bbp_favorite_topic_id', __( '<strong>ERROR</strong>: No topic was found. Which topic are you marking/unmarking as favorite?', 'bbpress' ) ); 499 499 500 500 // Check nonce … … 504 504 // Check current user's ability to edit the user 505 505 } elseif ( ! current_user_can( 'edit_user', $user_id ) ) { 506 bbp_add_error( 'bbp_favorite_permission s', __( '<strong>ERROR</strong>: You don\'t have the permission to edit favorites of that user!', 'bbpress' ) );506 bbp_add_error( 'bbp_favorite_permission', __( '<strong>ERROR</strong>: You do not have permission to edit favorites for that user!.', 'bbpress' ) ); 507 507 } 508 508 … … 546 546 // Fail! Handle errors 547 547 } elseif ( true === $is_favorite && 'bbp_favorite_remove' === $action ) { 548 bbp_add_error( 'bbp_favorite_remove', __( '<strong>ERROR</strong>: There was a problem removing that topic from favorites !', 'bbpress' ) );548 bbp_add_error( 'bbp_favorite_remove', __( '<strong>ERROR</strong>: There was a problem removing that topic from favorites.', 'bbpress' ) ); 549 549 } elseif ( false === $is_favorite && 'bbp_favorite_add' === $action ) { 550 bbp_add_error( 'bbp_favorite_add', __( '<strong>ERROR</strong>: There was a problem favoriting that topic !', 'bbpress' ) );550 bbp_add_error( 'bbp_favorite_add', __( '<strong>ERROR</strong>: There was a problem favoriting that topic.', 'bbpress' ) ); 551 551 } 552 552 } … … 1153 1153 // Check for empty forum 1154 1154 if ( empty( $forum_id ) ) { 1155 bbp_add_error( 'bbp_subscription_forum_id', __( '<strong>ERROR</strong>: No forum was found !Which forum are you subscribing/unsubscribing to?', 'bbpress' ) );1155 bbp_add_error( 'bbp_subscription_forum_id', __( '<strong>ERROR</strong>: No forum was found. Which forum are you subscribing/unsubscribing to?', 'bbpress' ) ); 1156 1156 1157 1157 // Check nonce … … 1161 1161 // Check current user's ability to edit the user 1162 1162 } elseif ( ! current_user_can( 'edit_user', $user_id ) ) { 1163 bbp_add_error( 'bbp_subscription_permission s', __( '<strong>ERROR</strong>: You don\'t have the permission to edit favorites of that user!', 'bbpress' ) );1163 bbp_add_error( 'bbp_subscription_permission', __( '<strong>ERROR</strong>: You do not have permission to edit favorites of that user.', 'bbpress' ) ); 1164 1164 } 1165 1165 … … 1203 1203 // Fail! Handle errors 1204 1204 } elseif ( true === $is_subscription && 'bbp_unsubscribe' === $action ) { 1205 bbp_add_error( 'bbp_unsubscribe', __( '<strong>ERROR</strong>: There was a problem unsubscribing from that forum !', 'bbpress' ) );1205 bbp_add_error( 'bbp_unsubscribe', __( '<strong>ERROR</strong>: There was a problem unsubscribing from that forum.', 'bbpress' ) ); 1206 1206 } elseif ( false === $is_subscription && 'bbp_subscribe' === $action ) { 1207 bbp_add_error( 'bbp_subscribe', __( '<strong>ERROR</strong>: There was a problem subscribing to that forum !', 'bbpress' ) );1207 bbp_add_error( 'bbp_subscribe', __( '<strong>ERROR</strong>: There was a problem subscribing to that forum.', 'bbpress' ) ); 1208 1208 } 1209 1209 } … … 1258 1258 // Check for empty topic 1259 1259 if ( empty( $topic_id ) ) { 1260 bbp_add_error( 'bbp_subscription_topic_id', __( '<strong>ERROR</strong>: No topic was found !Which topic are you subscribing/unsubscribing to?', 'bbpress' ) );1260 bbp_add_error( 'bbp_subscription_topic_id', __( '<strong>ERROR</strong>: No topic was found. Which topic are you subscribing/unsubscribing to?', 'bbpress' ) ); 1261 1261 1262 1262 // Check nonce … … 1266 1266 // Check current user's ability to edit the user 1267 1267 } elseif ( ! current_user_can( 'edit_user', $user_id ) ) { 1268 bbp_add_error( 'bbp_subscription_permission s', __( '<strong>ERROR</strong>: You don\'t have the permission to edit favorites of that user!', 'bbpress' ) );1268 bbp_add_error( 'bbp_subscription_permission', __( '<strong>ERROR</strong>: You do not have permission to edit favorites of that user.', 'bbpress' ) ); 1269 1269 } 1270 1270 … … 1308 1308 // Fail! Handle errors 1309 1309 } elseif ( true === $is_subscription && 'bbp_unsubscribe' === $action ) { 1310 bbp_add_error( 'bbp_unsubscribe', __( '<strong>ERROR</strong>: There was a problem unsubscribing from that topic !', 'bbpress' ) );1310 bbp_add_error( 'bbp_unsubscribe', __( '<strong>ERROR</strong>: There was a problem unsubscribing from that topic.', 'bbpress' ) ); 1311 1311 } elseif ( false === $is_subscription && 'bbp_subscribe' === $action ) { 1312 bbp_add_error( 'bbp_subscribe', __( '<strong>ERROR</strong>: There was a problem subscribing to that topic !', 'bbpress' ) );1312 bbp_add_error( 'bbp_subscribe', __( '<strong>ERROR</strong>: There was a problem subscribing to that topic.', 'bbpress' ) ); 1313 1313 } 1314 1314 } -
trunk/src/templates/default/bbpress/feedback-no-forums.php
r5770 r6141 12 12 <div class="bbp-template-notice"> 13 13 <ul> 14 <li><?php esc_html_e( 'Oh bother! No forums were found here!', 'bbpress' ); ?></li>14 <li><?php esc_html_e( 'Oh, bother! No forums were found here.', 'bbpress' ); ?></li> 15 15 </ul> 16 16 </div> -
trunk/src/templates/default/bbpress/feedback-no-replies.php
r5770 r6141 12 12 <div class="bbp-template-notice"> 13 13 <ul> 14 <li><?php esc_html_e( 'Oh bother! No replies were found here!', 'bbpress' ); ?></li>14 <li><?php esc_html_e( 'Oh, bother! No replies were found here.', 'bbpress' ); ?></li> 15 15 </ul> 16 16 </div> -
trunk/src/templates/default/bbpress/feedback-no-search.php
r5688 r6141 12 12 <div class="bbp-template-notice"> 13 13 <ul> 14 <li><?php esc_html_e( 'Oh bother! No search results were found here!', 'bbpress' ); ?></li>14 <li><?php esc_html_e( 'Oh, bother! No search results were found here.', 'bbpress' ); ?></li> 15 15 </ul> 16 16 </div> -
trunk/src/templates/default/bbpress/feedback-no-topics.php
r5770 r6141 12 12 <div class="bbp-template-notice"> 13 13 <ul> 14 <li><?php esc_html_e( 'Oh bother! No topics were found here!', 'bbpress' ); ?></li>14 <li><?php esc_html_e( 'Oh, bother! No topics were found here.', 'bbpress' ); ?></li> 15 15 </ul> 16 16 </div> -
trunk/src/templates/default/bbpress/form-reply-move.php
r5770 r6141 90 90 <div id="no-reply-<?php bbp_reply_id(); ?>" class="bbp-no-reply"> 91 91 <div class="entry-content"><?php is_user_logged_in() 92 ? esc_html_e( 'You do not have the permissions to edit this reply!', 'bbpress' )93 : esc_html_e( 'You cannot edit this reply.', 92 ? esc_html_e( 'You do not have permission to edit this reply.', 'bbpress' ) 93 : esc_html_e( 'You cannot edit this reply.', 'bbpress' ); 94 94 ?></div> 95 95 </div> -
trunk/src/templates/default/bbpress/form-topic-merge.php
r5770 r6141 112 112 <div id="no-topic-<?php bbp_topic_id(); ?>" class="bbp-no-topic"> 113 113 <div class="entry-content"><?php is_user_logged_in() 114 ? esc_html_e( 'You do not have the permissions to edit this topic!', 'bbpress' )115 : esc_html_e( 'You cannot edit this topic.', 114 ? esc_html_e( 'You do not have permission to edit this topic.', 'bbpress' ) 115 : esc_html_e( 'You cannot edit this topic.', 'bbpress' ); 116 116 ?></div> 117 117 </div> -
trunk/src/templates/default/bbpress/form-topic-split.php
r5770 r6141 116 116 <div id="no-topic-<?php bbp_topic_id(); ?>" class="bbp-no-topic"> 117 117 <div class="entry-content"><?php is_user_logged_in() 118 ? esc_html_e( 'You do not have the permissions to edit this topic!', 'bbpress' )119 : esc_html_e( 'You cannot edit this topic.', 118 ? esc_html_e( 'You do not have permission to edit this topic.', 'bbpress' ) 119 : esc_html_e( 'You cannot edit this topic.', 'bbpress' ); 120 120 ?></div> 121 121 </div>
Note: See TracChangeset
for help on using the changeset viewer.