<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[12274] sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers: Translate: Add mentions to comment box and Disable only Feedback <summary> events</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/12274">12274</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/12274","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>amieiro</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2022-11-23 18:22:00 +0000 (Wed, 23 Nov 2022)</dd>
</dl>

<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Translate: Add mentions to comment box and Disable only Feedback <summary> events

https://github.com/GlotPress/gp-translation-helpers/pull/113
https://github.com/GlotPress/gp-translation-helpers/pull/143</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsgptranslationhelpershelpershelpertranslationdiscussionphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers/helpers/helper-translation-discussion.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsgptranslationhelpershelpersassetstemplatestranslationdiscussioncommentsphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers/helpers-assets/templates/translation-discussion-comments.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsgptranslationhelpersincludesclasswporgcustomizationsphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers/includes/class-wporg-customizations.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsgptranslationhelpersincludesclasswporgnotificationsphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers/includes/class-wporg-notifications.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsgptranslationhelpersjsrejectfeedbackjs">sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers/js/reject-feedback.js</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsgptranslationhelpershelpershelpertranslationdiscussionphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers/helpers/helper-translation-discussion.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers/helpers/helper-translation-discussion.php 2022-11-23 07:04:37 UTC (rev 12273)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers/helpers/helper-translation-discussion.php   2022-11-23 18:22:00 UTC (rev 12274)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -266,8 +266,16 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        return $cache[ $post->ID ];
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                // phpcs:ignore WordPress.Security.NonceVerification.Missing
+               $locale_exists = isset( $_POST['meta']['locale'] ) && ! empty( $this->sanitize_comment_locale( $_POST['meta']['locale'] ) );
+
+               // phpcs:ignore WordPress.Security.NonceVerification.Missing
+               $locale_slug = $locale_exists ? $_POST['meta']['locale'] : null;
+
+               $set_slug = $locale_exists ? 'default' : null;
+
</ins><span class="cx" style="display: block; padding: 0 10px">                 // We were able to gather all information, let's put it in the cache.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $cache[ $post->ID ] = GP_Route_Translation_Helpers::get_permalink( $project->path, $original_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $cache[ $post->ID ] = GP_Route_Translation_Helpers::get_permalink( $project->path, $original_id, $set_slug, $locale_slug );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                return $cache[ $post->ID ];
</span><span class="cx" style="display: block; padding: 0 10px">        }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -561,7 +569,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                remove_action( 'comment_form_top', 'rosetta_comment_form_support_hint' );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $post   = self::maybe_get_temporary_post( self::get_shadow_post_id( $this->data['original_id'] ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $post          = self::maybe_get_temporary_post( self::get_shadow_post_id( $this->data['original_id'] ) );
+               $mentions_list = apply_filters( 'gp_mentions_list', array(), $comments, $this->data['locale_slug'], $this->data['original_id'] );
+
</ins><span class="cx" style="display: block; padding: 0 10px">                 $output = gp_tmpl_get_output(
</span><span class="cx" style="display: block; padding: 0 10px">                        'translation-discussion-comments',
</span><span class="cx" style="display: block; padding: 0 10px">                        array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -573,6 +583,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                'original_id'          => $this->data['original_id'],
</span><span class="cx" style="display: block; padding: 0 10px">                                'project'              => $this->data['project'],
</span><span class="cx" style="display: block; padding: 0 10px">                                'translation_set_slug' => $this->data['translation_set_slug'],
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                'mentions_list'        => $mentions_list,
+
</ins><span class="cx" style="display: block; padding: 0 10px">                         ),
</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assets_dir . 'templates'
</span><span class="cx" style="display: block; padding: 0 10px">                );
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsgptranslationhelpershelpersassetstemplatestranslationdiscussioncommentsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers/helpers-assets/templates/translation-discussion-comments.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers/helpers-assets/templates/translation-discussion-comments.php      2022-11-23 07:04:37 UTC (rev 12273)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers/helpers-assets/templates/translation-discussion-comments.php        2022-11-23 18:22:00 UTC (rev 12274)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -184,3 +184,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">        }
</span><span class="cx" style="display: block; padding: 0 10px">        ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .discussion-wrapper -->
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<script>  
+       jQuery(function( e, mentions ) {
+               var mentionsList = '<?php echo wp_json_encode( $mentions_list ); ?>';
+               var jetpackMentionsData = JSON.parse( mentionsList );
+               if( jetpackMentionsData.length > 0 ) {
+                       jQuery( 'textarea#comment' ).mentions( jetpackMentionsData );
+               }
+       });
+</script>
</ins></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsgptranslationhelpersincludesclasswporgcustomizationsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers/includes/class-wporg-customizations.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers/includes/class-wporg-customizations.php   2022-11-23 07:04:37 UTC (rev 12273)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers/includes/class-wporg-customizations.php     2022-11-23 18:22:00 UTC (rev 12274)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -43,6 +43,16 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                10,
</span><span class="cx" style="display: block; padding: 0 10px">                                2
</span><span class="cx" style="display: block; padding: 0 10px">                        );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+                       add_filter( 'jetpack_mentions_should_load_ui', '__return_true' );
+                       add_filter(
+                               'jetpack_mentions_allowed_post_types',
+                               function( $post_types ) {
+                                       $post_types[] = Helper_Translation_Discussion::POST_TYPE;
+                                       return $post_types;
+                               }
+                       );
+
</ins><span class="cx" style="display: block; padding: 0 10px">                 }
</span><span class="cx" style="display: block; padding: 0 10px">        }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsgptranslationhelpersincludesclasswporgnotificationsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers/includes/class-wporg-notifications.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers/includes/class-wporg-notifications.php    2022-11-23 07:04:37 UTC (rev 12273)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers/includes/class-wporg-notifications.php      2022-11-23 18:22:00 UTC (rev 12274)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -94,6 +94,76 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                10,
</span><span class="cx" style="display: block; padding: 0 10px">                                2
</span><span class="cx" style="display: block; padding: 0 10px">                        );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                        add_filter(
+                               'gp_mentions_list',
+                               function( $result, $comments, $locale, $original_id ) {
+                                       $validator_email_addresses  = ( $locale && $original_id ) ? WPorg_GlotPress_Notifications::get_validator_details_for_original_id( $locale, $original_id ) : array();
+                                       $commenters_email_addresses = array_values( GP_Notifications::get_commenters_email_addresses( $comments ) );
+
+                                       // Remove commenter email if it already exists as a GTE.
+                                       $commenters_email_addresses = array_filter(
+                                               $commenters_email_addresses,
+                                               function( $commenter_email ) use ( $validator_email_addresses ) {
+                                                       return ( ! in_array( $commenter_email, array_column( $validator_email_addresses, 'email' ) ) );
+                                               }
+                                       );
+
+                                       $commenters_email_role = array_map(
+                                               function( $commenter_email ) {
+                                                       return(
+                                                       array(
+                                                               'role'  => 'commenter',
+                                                               'email' => $commenter_email,
+                                                       )
+                                                       );
+                                               },
+                                               $commenters_email_addresses
+                                       );
+
+                                       $all_email_addresses = array_merge(
+                                               $validator_email_addresses,
+                                               $commenters_email_role
+                                       );
+
+                                       $current_user       = wp_get_current_user();
+                                       $current_user_email = $current_user->user_email;
+
+                                       // Find all instances of the logged_in user in the array
+                                       $user_search_result = array_keys( array_column( $all_email_addresses, 'email' ), $current_user_email );
+
+                                       if ( false !== $user_search_result ) {
+                                               foreach ( $user_search_result as $index ) {
+                                                       unset( $all_email_addresses[ $index ] );
+                                               }
+                                               $all_email_addresses = array_values( $all_email_addresses );
+                                       }
+
+                                       $users = array_map(
+                                               function( $mentionable_user ) {
+                                                       $email = $mentionable_user;
+                                                       $role  = '';
+                                                       if ( is_array( $mentionable_user ) ) {
+                                                               $email = $mentionable_user['email'];
+                                                               $role  = ! ( 'commenter' === $mentionable_user['role'] ) ? ' - ' . $mentionable_user['role'] : '';
+                                                       }
+
+                                                               $user = get_user_by( 'email', $email );
+                                                               return array(
+                                                                       'ID'            => $user->ID,
+                                                                       'user_login'    => $user->user_login,
+                                                                       'user_nicename' => $user->user_nicename . $role,
+                                                                       'display_name'  => '',
+                                                                       'source'        => array( 'translators' ),
+                                                                       'image_URL'     => get_avatar_url( $user->ID ),
+                                                               );
+                                               },
+                                               $all_email_addresses
+                                       );
+                                                       return $users;
+                               },
+                               10,
+                               4
+                       );
</ins><span class="cx" style="display: block; padding: 0 10px">                 }
</span><span class="cx" style="display: block; padding: 0 10px">        }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -119,6 +189,54 @@
</span><span class="cx" style="display: block; padding: 0 10px">        }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         * Gets the email addresses and roles(GTE/PTE/CLPTE) of all project validators: GTE, PTE and CLPTE.
+        *
+        * @since 0.0.2
+        *
+        * @param string $locale  The locale for the translation.
+        * @param int    $original_id  The original id for the string.
+        *
+        * @return array    The emails and roles(GTE/PTE/CLPTE) of the validators.
+        */
+       public static function get_validator_details_for_original_id( $locale, $original_id ): array {
+               $gtes_email_and_role = array_map(
+                       function( $gte_email ) {
+                               return array(
+                                       'role'  => 'GTE',
+                                       'email' => $gte_email,
+                               );
+                       },
+                       self::get_gte_email_addresses( $locale )
+               );
+
+               $ptes_email_and_role = array_map(
+                       function( $pte_email ) {
+                               return array(
+                                       'role'  => 'GTE',
+                                       'email' => $pte_email,
+                               );
+                       },
+                       self::get_pte_email_addresses_by_project_and_locale( $original_id, $locale )
+               );
+
+               $clptes_email_and_role = array_map(
+                       function( $clpte_email ) {
+                               return array(
+                                       'role'  => 'GTE',
+                                       'email' => $clpte_email,
+                               );
+                       },
+                       self::get_clpte_email_addresses_by_project( $original_id )
+               );
+
+               return array_merge(
+                       array_merge( $gtes_email_and_role, $ptes_email_and_role ),
+                       $clptes_email_and_role
+               );
+       }
+
+
+       /**
</ins><span class="cx" style="display: block; padding: 0 10px">          * Gets the general translation editors (GTE) emails for the given locale.
</span><span class="cx" style="display: block; padding: 0 10px">         *
</span><span class="cx" style="display: block; padding: 0 10px">         * @since 0.0.2
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsgptranslationhelpersjsrejectfeedbackjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers/js/reject-feedback.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers/js/reject-feedback.js     2022-11-23 07:04:37 UTC (rev 12273)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers/js/reject-feedback.js       2022-11-23 18:22:00 UTC (rev 12274)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,7 +22,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        $( 'body' ).append( modalFeedbackForm );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        // Remove click event added to <summary> by wporg-gp-customizations plugin
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $( $gp.editor.table ).off( 'click', 'summary' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $( $gp.editor.table ).off( 'click', 'summary.feedback-summary' );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        $( '#bulk-actions-toolbar-top .button, #bulk-actions-toolbar-bottom .button' ).click(
</span><span class="cx" style="display: block; padding: 0 10px">                                function( e ) {
</span></span></pre>
</div>
</div>

</body>
</html>