<!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>[11937] sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-profiles: GP Profiles: Process bulk translation activity.</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/11937">11937</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/11937","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>iandunn</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2022-07-05 16:59:28 +0000 (Tue, 05 Jul 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'>GP Profiles: Process bulk translation activity.
Only approvals are done at the moment, but reject/fuzzy will be added when we start to credit editor review actions.
See https://github.com/WordPress/five-for-the-future/issues/196</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggpprofilesprofilesphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-profiles/profiles.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggpprofilestestse2ephp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-profiles/tests/e2e.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggpprofilesprofilesphp"></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/wporg-gp-profiles/profiles.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/wporg-gp-profiles/profiles.php 2022-07-05 16:59:12 UTC (rev 11936)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-profiles/profiles.php 2022-07-05 16:59:28 UTC (rev 11937)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,7 +9,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> namespace WordPressdotorg\GlotPress\Profiles;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> use WordPressdotorg\Profiles as Profiles_API;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-use GP, GP_Translation;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+use GP, GP_Translation, GP_Project, GP_Locale, GP_Translation_Set;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> defined( 'WPINC' ) || die();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,13 +22,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-add_action( 'gp_translation_created', __NAMESPACE__ . '\add_translation_activity' );
-add_action( 'gp_translation_saved', __NAMESPACE__ . '\add_translation_activity', 10, 2 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+add_action( 'gp_translation_created', __NAMESPACE__ . '\add_single_translation_activity' );
+add_action( 'gp_translation_saved', __NAMESPACE__ . '\add_single_translation_activity', 10, 2 );
+add_action( 'gp_translation_set_bulk_action_post', __NAMESPACE__ . '\add_bulk_translation_activity', 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"> * Add a activity when strings are suggested and approved.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function add_translation_activity( GP_Translation $new_translation, GP_Translation $previous_translation = null ) : void {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function add_single_translation_activity( GP_Translation $new_translation, GP_Translation $previous_translation = null ) : void {
+ $bulk_request = gp_post( 'bulk', null );
+
+ // Bulk actions are handled by `add_bulk_translation_activity()`.
+ if ( $bulk_request ) {
+ return;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $current_user_is_editor = GP::$permission->current_user_can(
</span><span class="cx" style="display: block; padding: 0 10px"> 'approve',
</span><span class="cx" style="display: block; padding: 0 10px"> 'translation-set',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -57,3 +65,64 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> Profiles_API\api( $request_body );
</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 activity when bulk actions are performed.
+ */
+function add_bulk_translation_activity( GP_Project $project, GP_Locale $locale, GP_Translation_Set $translation_set, array $bulk ) : void {
+ switch ( $bulk['action'] ) {
+ case 'approve':
+ $type = 'glotpress_translation_approved';
+ break;
+
+ default:
+ return;
+ }
+
+ $translation_ids = array();
+ foreach ( $bulk['row-ids'] as $row_id ) {
+ $parts = explode( '-', $row_id );
+ $translation_ids[] = intval( $parts[1] ?? 0 );
+ }
+
+ $translations = GP::$translation->find_many(
+ sprintf( 'id IN ( %s )', implode( ',', $translation_ids ) )
+ );
+
+ $user_type_counts = array();
+ foreach ( $translations as $translation ) {
+ // `GP_Route_Translation::_bulk_approve()` tracks which `set_status()` calls succeed, but that information
+ // isn't passed to this callback. Check this just in case any of them failed.
+ if ( 'current' !== $translation->status ) {
+ continue;
+ }
+
+ $user_id = $translation->user_id;
+
+ if ( isset( $user_type_counts[ $user_id ][ $type ] ) ) {
+ $user_type_counts[ $user_id ][ $type ]++;
+ } else {
+ $user_type_counts[ $user_id ][ $type ] = 1;
+ }
+ }
+
+ $activities = array();
+ foreach ( $user_type_counts as $user_id => $types ) {
+ foreach ( $types as $type => $count ) {
+ $activities[] = array(
+ 'component' => 'glotpress',
+ 'type' => $type,
+ 'user_id' => $user_id,
+ 'bump' => $count,
+ );
+ }
+ }
+
+ $request_body = array(
+ 'action' => 'wporg_handle_activity',
+ 'component' => 'glotpress',
+ 'activities' => $activities,
+ );
+
+ Profiles_API\api( $request_body );
+}
</ins></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggpprofilestestse2ephp"></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/wporg-gp-profiles/tests/e2e.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/wporg-gp-profiles/tests/e2e.php 2022-07-05 16:59:12 UTC (rev 11936)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-profiles/tests/e2e.php 2022-07-05 16:59:28 UTC (rev 11937)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -44,13 +44,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_id' => $user->ID,
</span><span class="cx" style="display: block; padding: 0 10px"> 'status' => 'waiting',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- GlotPress_Profiles\add_translation_activity( $translation );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ GlotPress_Profiles\add_single_translation_activity( $translation );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $translation = new GP_Translation( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_id' => $user->ID,
</span><span class="cx" style="display: block; padding: 0 10px"> 'status' => 'current',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- GlotPress_Profiles\add_translation_activity( $translation );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ GlotPress_Profiles\add_single_translation_activity( $translation );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> echo "\nThe daily digest count should have been bumped on https://profiles.wordpress.org/$user->user_nicename/ \n";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>