Ticket #3456: 3456_2.diff

wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-directory-compat.php

@@ -751 +751 @@
                         if ( 'plugin' == $this->compat() ) {
                                 $subscribe   = esc_html__( 'Subscribe to this plugin', 'wporg-forums' );
                                 $unsubscribe = esc_html__( 'Unsubscribe from this plugin', 'wporg-forums' );
+                                $subscribe_description   = esc_html__( 'Receive email updates about new topics on this plugin', 'wporg-forums' );
+                                $unsubscribe_description = esc_html__( 'Unsubscribe from email updates about new topics on this plugin', 'wporg-forums' );
                         } else {
                                 $subscribe   = esc_html__( 'Subscribe to this theme', 'wporg-forums' );
                                 $unsubscribe = esc_html__( 'Unsubscribe from this theme', 'wporg-forums' );
+                                $subscribe_description   = esc_html__( 'Receive email updates about new topics on this theme', 'wporg-forums' );
+                                $unsubscribe_description = esc_html__( 'Unsubscribe from email updates about new topics on this theme', 'wporg-forums' );
                         }
                         $term_subscription = Term_Subscription\Plugin::get_subscription_link( array(
                                 'term_id'     => $term->term_id,
                                 'taxonomy'    => $this->taxonomy(),
                                 'subscribe'   => $subscribe,
                                 'unsubscribe' => $unsubscribe,
+                                'subscribe_description'   => $subscribe_description,
+                                'unsubscribe_description' => $unsubscribe_description,
                         ) );
                 }
 

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

@@ -226 +226 @@
                 // Strip tags from text and set up message body.
                 $topic_content = strip_tags( bbp_get_topic_content( $topic_id ) );
                 $topic_url     = get_permalink( $topic_id );
-
+                $forum_url = get_permalink( $forum_id )
                 $message = sprintf( __( '%1$s wrote:
 
 %2$s
@@ -237 +237 @@
 
 %4$s
 
-Login and visit the topic to reply to the topic or unsubscribe from these emails. Note that replying to this email has no effect.', 'wporg-forums' ),
+Login and visit the topic to reply.
+To no longer receive emails about this topic, please visit the link below to unsubscribe:
+%5$s
+Note that replying to this email has no effect.', 'wporg-forums' ),
                         $topic_author_name,
                         $topic_content,
                         $topic_url,
                         // String may not have placeholders, ie. in the case of tags.
-                        sprintf( $this->labels['receipt'], $this->directory ? $this->directory->title() : '' )
+                        sprintf( $this->labels['receipt'], $this->directory ? $this->directory->title() : '' ),
+                        $forum_url,
                 );
 
                 return $message;
@@ -579 +583 @@
                         'taxonomy'    => 'topic-tag',
                         'subscribe'   => esc_html__( 'Subscribe to this topic tag', 'wporg-forums' ),
                         'unsubscribe' => esc_html__( 'Unsubscribe from this topic tag', 'wporg-forums' ),
+                        'subscribe_description'   => esc_html__( 'Receive email updates about new topics', 'wporg-forums' ),
+                        'unsubscribe_description' => esc_html__( 'Unsubscribe from email updates about new topics', 'wporg-forums' ),
                 ), 'get_term_subscription_link' );
                 if ( empty( $r['user_id'] ) || empty( $r['term_id'] ) || empty( $r['taxonomy'] ) ) {
                         return false;
@@ -590 +596 @@
 
                 $url = self::get_subscription_url( $r['user_id'], $r['term_id'], $r['taxonomy'] );
                 $text = $r['subscribe'];
+                $description = $r['subscribe_description'];
                 if ( self::is_user_subscribed_to_term( $r['user_id'], $r['term_id'] ) ) {
                         $text = $r['unsubscribe'];
+                        $description = $r['unsubscribe_description'];
                 }
-                return sprintf( "<div class='wporg-bbp-term-subscription'><a href='%s'>%s</a></div>",
+
+                return sprintf( "<div class='wporg-bbp-term-subscription'><a href='%s'>%s</a> <div class='notice notice-info notice-alt'>%s</div></div>",
                         $url,
-                        esc_html( $text ) );
+                        esc_html( $text ),
+                        esc_html( $description )
+                );
         }
 
         public static function get_valid_actions() {