Changeset 6141 for trunk/src/includes/topics/functions.php

Timestamp:

12/08/2016 04:14:17 PM (9 years ago)

Author:

johnjamesjacoby

Message:

Even less shouting, plus a grammar sweep.

• Remove contractions
• Update weird sounding English phrases (like "the permissions" to "permission")
• Simplify some phrases to be less wordy
• Update "permission" error codes to all use "permission" instead of also "permissions"
• Add comma to "Oh bother!". See: ​https://www.youtube.com/watch?v=Fhl4oKvxphs

File:

• trunk/src/includes/topics/functions.php (modified) (13 diffs)

trunk/src/includes/topics/functions.php

@@ -163 +163 @@
         // User cannot create topics
         if ( ! current_user_can( 'publish_topics' ) ) {
-            bbp_add_error( 'bbp_topic_permissions', __( '<strong>ERROR</strong>: You do not have permission to create new topics.', 'bbpress' ) );
+            bbp_add_error( 'bbp_topic_permission', __( '<strong>ERROR</strong>: You do not have permission to create new topics.', 'bbpress' ) );
             return;
         }
@@ -505 +505 @@
             // User cannot edit this topic
             if ( ! current_user_can( 'edit_topic', $topic_id ) ) {
-                bbp_add_error( 'bbp_edit_topic_permissions', __( '<strong>ERROR</strong>: You do not have permission to edit that topic.', 'bbpress' ) );
+                bbp_add_error( 'bbp_edit_topic_permission', __( '<strong>ERROR</strong>: You do not have permission to edit that topic.', 'bbpress' ) );
             }
 
@@ -1233 +1233 @@
     // Cannot edit source topic
     if ( ! current_user_can( 'edit_topic', $source_topic->ID ) ) {
-        bbp_add_error( 'bbp_merge_topic_source_permission', __( '<strong>ERROR</strong>: You do not have the permissions to edit the source topic.', 'bbpress' ) );
+        bbp_add_error( 'bbp_merge_topic_source_permission', __( '<strong>ERROR</strong>: You do not have permission to edit the source topic.', 'bbpress' ) );
         return;
     }
@@ -1253 +1253 @@
     // Cannot edit destination topic
     if ( ! current_user_can( 'edit_topic', $destination_topic->ID ) ) {
-        bbp_add_error( 'bbp_merge_topic_destination_permission', __( '<strong>ERROR</strong>: You do not have the permissions to edit the destination topic.', 'bbpress' ) );
+        bbp_add_error( 'bbp_merge_topic_destination_permission', __( '<strong>ERROR</strong>: You do not have permission to edit the destination topic.', 'bbpress' ) );
     }
 
@@ -1512 +1512 @@
 
     if ( empty( $_POST['bbp_reply_id'] ) ) {
-        bbp_add_error( 'bbp_split_topic_reply_id', __( '<strong>ERROR</strong>: Reply ID to split the topic from not found!', 'bbpress' ) );
+        bbp_add_error( 'bbp_split_topic_reply_id', __( '<strong>ERROR</strong>: A reply ID is required.', 'bbpress' ) );
     } else {
         $from_reply_id = (int) $_POST['bbp_reply_id'];
@@ -1542 +1542 @@
     // Use cannot edit topic
     if ( ! current_user_can( 'edit_topic', $source_topic->ID ) ) {
-        bbp_add_error( 'bbp_split_topic_source_permission', __( '<strong>ERROR</strong>: You do not have the permissions to edit the source topic.', 'bbpress' ) );
+        bbp_add_error( 'bbp_split_topic_source_permission', __( '<strong>ERROR</strong>: You do not have permission to edit the source topic.', 'bbpress' ) );
     }
 
@@ -1565 +1565 @@
                 // Get destination topic id
                 if ( empty( $_POST['bbp_destination_topic'] ) ) {
-                    bbp_add_error( 'bbp_split_topic_destination_id', __( '<strong>ERROR</strong>: Destination topic ID not found!', 'bbpress' ) );
+                    bbp_add_error( 'bbp_split_topic_destination_id', __( '<strong>ERROR</strong>: A topic ID is required.', 'bbpress' ) );
                 } else {
                     $destination_topic_id = (int) $_POST['bbp_destination_topic'];
@@ -1575 +1575 @@
                 // No destination topic
                 if ( empty( $destination_topic ) ) {
-                    bbp_add_error( 'bbp_split_topic_destination_not_found', __( '<strong>ERROR</strong>: The topic you want to split to was not found!', 'bbpress' ) );
+                    bbp_add_error( 'bbp_split_topic_destination_not_found', __( '<strong>ERROR</strong>: The topic you want to split to was not found.', 'bbpress' ) );
                 }
 
                 // User cannot edit the destination topic
                 if ( ! current_user_can( 'edit_topic', $destination_topic->ID ) ) {
-                    bbp_add_error( 'bbp_split_topic_destination_permission', __( '<strong>ERROR</strong>: You do not have the permissions to edit the destination topic!', 'bbpress' ) );
+                    bbp_add_error( 'bbp_split_topic_destination_permission', __( '<strong>ERROR</strong>: You do not have permission to edit the destination topic.', 'bbpress' ) );
                 }
 
@@ -1623 +1623 @@
                 // User cannot publish posts
                 } else {
-                    bbp_add_error( 'bbp_split_topic_destination_permission', __( '<strong>ERROR</strong>: You do not have the permissions to create new topics. The reply could not be converted into a topic.', 'bbpress' ) );
+                    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' ) );
                 }
 
@@ -1898 +1898 @@
             // Can user edit topic tags?
             if ( ! current_user_can( 'edit_topic_tags' ) ) {
-                bbp_add_error( 'bbp_manage_topic_tag_update_permissions', __( '<strong>ERROR</strong>: You do not have the permissions to edit the topic tags.', 'bbpress' ) );
+                bbp_add_error( 'bbp_manage_topic_tag_update_permission', __( '<strong>ERROR</strong>: You do not have permission to edit the topic tags.', 'bbpress' ) );
                 return;
             }
@@ -1938 +1938 @@
             // Can user edit topic tags?
             if ( ! current_user_can( 'edit_topic_tags' ) ) {
-                bbp_add_error( 'bbp_manage_topic_tag_merge_permissions', __( '<strong>ERROR</strong>: You do not have the permissions to edit the topic tags.', 'bbpress' ) );
+                bbp_add_error( 'bbp_manage_topic_tag_merge_permission', __( '<strong>ERROR</strong>: You do not have permission to edit the topic tags.', 'bbpress' ) );
                 return;
             }
@@ -1996 +1996 @@
             // Can user delete topic tags?
             if ( ! current_user_can( 'delete_topic_tags' ) ) {
-                bbp_add_error( 'bbp_manage_topic_tag_delete_permissions', __( '<strong>ERROR</strong>: You do not have the permissions to delete the topic tags.', 'bbpress' ) );
+                bbp_add_error( 'bbp_manage_topic_tag_delete_permission', __( '<strong>ERROR</strong>: You do not have permission to delete the topic tags.', 'bbpress' ) );
                 return;
             }
@@ -2168 +2168 @@
     // What is the user doing here?
     if ( ! current_user_can( 'edit_topic', $topic->ID ) || ( 'bbp_toggle_topic_trash' === $action && ! current_user_can( 'delete_topic', $topic->ID ) ) ) {
-        bbp_add_error( 'bbp_toggle_topic_permission', __( '<strong>ERROR:</strong> You do not have the permission to do that.', 'bbpress' ) );
+        bbp_add_error( 'bbp_toggle_topic_permission', __( '<strong>ERROR:</strong> You do not have permission to do that.', 'bbpress' ) );
         return;
     }