Changeset 12012 for sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-term-subscription/inc/class-plugin.php

Timestamp:

08/10/2022 05:03:34 PM (3 years ago)

Author:

SergeyBiryukov

Message:

Support Forums: Improve consistency of various error messages.

• Use sentence case for the word Error, instead of all caps. Using all caps should be avoided for better readability and because screen readers may pronounce all-caps words as abbreviations.
• Move the colon of the Error: prefix inside the <strong> tags.

This matches similar changes in WordPress core.

Follow-up to ​[WP47156], ​[WP53118], ​[WP53337], ​[WP53458], [3702], [3719], [3797], [3937], [4043], [11301], [11382], [11383], [11580].

Props NekoJonez.
Fixes #6309.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-term-subscription/inc/class-plugin.php (modified) (6 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-term-subscription/inc/class-plugin.php

@@ -115 +115 @@
         if ( $is_subscribed ) {
             $message = sprintf(
-                __( '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' ),
+                __( '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' ),
                 self::get_subscription_url( get_current_user_id(), $term->term_id, $this->taxonomy ),
                 esc_html( $term->name )
@@ -169 +169 @@
 
             if ( ! $user_id ) {
-                bbp_add_error( 'wporg_bbp_subscribe_invalid_token', __( '<strong>ERROR</strong>: Link expired!', 'wporg-forums' ) );
+                bbp_add_error( 'wporg_bbp_subscribe_invalid_token', __( '<strong>Error:</strong> Link expired!', 'wporg-forums' ) );
                 return false;
             }
@@ -206 +206 @@
         // Check for empty term id.
         if ( empty( $user_id ) ) {
-            bbp_add_error( 'wporg_bbp_subscribe_logged_id', __( '<strong>ERROR</strong>: You must be logged in to do this!', 'wporg-forums' ) );
+            bbp_add_error( 'wporg_bbp_subscribe_logged_id', __( '<strong>Error:</strong> You must be logged in to do this!', 'wporg-forums' ) );
 
         // Check nonce.
         } elseif ( 'token' !== $auth && ! bbp_verify_nonce_request( 'toggle-term-subscription_' . $user_id . '_' . $term_id . '_' . $this->taxonomy ) ) {
-            bbp_add_error( 'wporg_bbp_subscribe_nonce', __( '<strong>ERROR</strong>: Are you sure you wanted to do that?', 'wporg-forums' ) );
+            bbp_add_error( 'wporg_bbp_subscribe_nonce', __( '<strong>Error:</strong> Are you sure you wanted to do that?', 'wporg-forums' ) );
 
         // Check user's ability to spectate if attempting to subscribe to a term.
         } elseif ( ! user_can( $user_id, 'spectate' ) && 'wporg_bbp_subscribe_term' === $action ) {
-            bbp_add_error( 'wporg_bbp_subscribe_permissions', __( '<strong>ERROR</strong>: You don\'t have permission to do this!', 'wporg-forums' ) );
+            bbp_add_error( 'wporg_bbp_subscribe_permissions', __( '<strong>Error:</strong> You don\'t have permission to do this!', 'wporg-forums' ) );
         }
 
@@ -246 +246 @@
         } elseif ( true === $is_subscribed && 'wporg_bbp_subscribe_term' === $action ) {
             /* translators: Term: topic tag */
-            bbp_add_error( 'wporg_bbp_subscribe_user', __( '<strong>ERROR</strong>: There was a problem subscribing to that term!', 'wporg-forums' ) );
+            bbp_add_error( 'wporg_bbp_subscribe_user', __( '<strong>Error:</strong> There was a problem subscribing to that term!', 'wporg-forums' ) );
         } elseif ( false === $is_subscribed && 'wporg_bbp_unsubscribe_term' === $action ) {
             /* translators: Term: topic tag */
-            bbp_add_error( 'wporg_bbp_unsubscribe_user', __( '<strong>ERROR</strong>: There was a problem unsubscribing from that term!', 'wporg-forums' ) );
+            bbp_add_error( 'wporg_bbp_unsubscribe_user', __( '<strong>Error:</strong> There was a problem unsubscribing from that term!', 'wporg-forums' ) );
         }
     }
@@ -361 +361 @@
 %4$s
 
-To unsubscribe from future emails click here:
+To unsubscribe from future emails, click here:
 ####UNSUB_LINK####', 'wporg-forums' ),
             $topic_author_name,
@@ -503 +503 @@
 %4$s
 
-To unsubscribe from future emails click here:
+To unsubscribe from future emails, click here:
 ####UNSUB_LINK####', 'wporg-forums' ),
             $reply_author_name,