<!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>[11992] sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers: Sync the gp-translation-helpers with GitHub, main branch</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/11992">11992</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/11992","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-07-22 14:09:19 +0000 (Fri, 22 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'>Sync the gp-translation-helpers with GitHub, main branch</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsgptranslationhelperscssdiscussioncss">sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers/css/discussion.css</a></li>
<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_htmlwpcontentpluginsgptranslationhelpersincludesclassgpnotificationsphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers/includes/class-gp-notifications.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsgptranslationhelpersincludesclassgptranslationhelpersphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers/includes/class-gp-translation-helpers.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>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsgptranslationhelpersjstranslationhelpersjs">sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers/js/translation-helpers.js</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsgptranslationhelperstemplatesdiscussionphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers/templates/discussion.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsgptranslationhelperstemplatesoriginalpermalinktemplatephp">sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers/templates/original-permalink-template.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers/templates/gp-templates-overrides/</li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsgptranslationhelperstemplatesgptemplatesoverridestranslationroweditormetastatusphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers/templates/gp-templates-overrides/translation-row-editor-meta-status.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsgptranslationhelperstemplatestranslationroweditormetafeedbackphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers/templates/translation-row-editor-meta-feedback.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsgptranslationhelperscssdiscussioncss"></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/css/discussion.css</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/css/discussion.css 2022-07-22 08:34:00 UTC (rev 11991)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers/css/discussion.css 2022-07-22 14:09:19 UTC (rev 11992)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4,7 +4,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> #original h1 {
</span><span class="cx" style="display: block; padding: 0 10px"> margin: .5em 14px;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- line-height: 34px;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ line-height: 45px;
</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"> #original p {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -67,6 +67,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> .comment-content {
</span><span class="cx" style="display: block; padding: 0 10px"> text-align: start;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.comment-content span.dashicons.dashicons-info,
+.feedback-reason-list span.dashicons.dashicons-info,
+#TB_window span.dashicons.dashicons-info {
+ color: #D3D3D3;
+ font-size:16px;
+}
+.feedback-reason-list li {
+ white-space:nowrap;
+ padding-right: 2px;
+}
+.ui-tooltip {
+ z-index: 100051 !important;
+}
</ins><span class="cx" style="display: block; padding: 0 10px"> .comment-form-comment label{
</span><span class="cx" style="display: block; padding: 0 10px"> display: block;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -208,4 +221,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> #TB_closeWindowButton:focus .tb-close-icon {
</span><span class="cx" style="display: block; padding: 0 10px"> -webkit-box-shadow: none;
</span><span class="cx" style="display: block; padding: 0 10px"> box-shadow: none;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+}
+.hoverTooltip {
+ position: fixed !important;
+}
+
+a.comment-reply-link {
+ margin: 2px !important;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<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-07-22 08:34:00 UTC (rev 11991)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers/helpers/helper-translation-discussion.php 2022-07-22 14:09:19 UTC (rev 11992)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -510,7 +510,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter(
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_form_fields',
</span><span class="cx" style="display: block; padding: 0 10px"> function( $comment_fields ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comment_fields['comment'] = str_replace( '>Comment<', '>Please leave your comment about this string here:<', $comment_fields['comment'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_fields['comment'] = str_replace( '</label>', ' (required)</label>', $comment_fields['comment'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> return $comment_fields;
</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">@@ -663,7 +663,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $data_attribute_string = trim( $data_attribute_string );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $link = sprintf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "<a rel='nofollow' class='comment-reply-link' href='%s' %s aria-label='%s'>%s</a>",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "<a rel='nofollow' class='comment-reply-link button is-primary' href='%s' %s aria-label='%s'>%s</a>",
</ins><span class="cx" style="display: block; padding: 0 10px"> esc_url(
</span><span class="cx" style="display: block; padding: 0 10px"> add_query_arg(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -718,23 +718,41 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Return an array of allowed rejection reasons
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Return an array of allowed rejection reasons and explanation of each reason.
</ins><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 class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public static function get_reject_reasons() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public static function get_reject_reasons(): array {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'style' => __( 'Style Guide' ),
- 'grammar' => __( 'Grammar' ),
- 'branding' => __( 'Branding' ),
- 'glossary' => __( 'Glossary' ),
- 'punctuation' => __( 'Punctuation' ),
- 'typo' => __( 'Typo' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'style' => array(
+ 'name' => __( 'Style Guide' ),
+ 'explanation' => __( 'The translation is not following the style guide. It will be interesting to provide a link to the style guide for your locale in the comment.' ),
+ ),
+ 'grammar' => array(
+ 'name' => __( 'Grammar' ),
+ 'explanation' => __( 'The translation has some grammar problems. It will be interesting to provide a link explaining the grammar issue for your locale in the comment.' ),
+ ),
+ 'branding' => array(
+ 'name' => __( 'Branding' ),
+ 'explanation' => __( 'The translation is using incorrectly some brand. E.g. WordPress without the capital P.' ),
+ ),
+ 'glossary' => array(
+ 'name' => __( 'Glossary' ),
+ 'explanation' => __( 'The translation is not using the glossary correctly. It will be interesting to provide some link to the glossary for your locale in the comment.' ),
+ ),
+ 'punctuation' => array(
+ 'name' => __( 'Punctuation' ),
+ 'explanation' =>
+ __( 'The translation is not using the punctuation marks correctly.' ),
+ ),
+ 'typo' => array(
+ 'name' => __( 'Typo' ),
+ 'explanation' => __( 'The translation has a typo. E.g., it is using the \'apostrope\' word instead of \'apostrophe\'.' ),
+ ),
</ins><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">-
</del><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">@@ -868,7 +886,31 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( $reject_reason ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php echo esc_html( _n( 'Rejection Reason: ', 'Rejection Reasons: ', count( $reject_reason ) ) ); ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <span><?php echo wp_kses( implode( '</span> | <span>', $reject_reason ), array( 'span' => array() ) ); ?></span>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ $number_of_items = count( $reject_reason );
+ $counter = 0;
+ $reject_reasons = Helper_Translation_Discussion::get_reject_reasons();
+ foreach ( $reject_reason as $reason ) {
+ echo wp_kses(
+ sprintf(
+ /* translators: 1: Title with the explanation of the reject reason , 2: The reject reason */
+ __( '<span title="%1$s" class="tooltip">%2$s</span> <span class="tooltip dashicons dashicons-info" title="%1$s"></span>', 'glotpress' ),
+ $reject_reasons[ $reason ]['explanation'],
+ $reject_reasons[ $reason ]['name'],
+ ),
+ array(
+ 'span' => array(
+ 'class' => array(),
+ 'title' => array(),
+ ),
+ )
+ );
+
+ if ( ++$counter < $number_of_items ) {
+ echo ', ';
+ }
+ }
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -928,6 +970,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'title_reply_to' => esc_html__( 'Reply to %s' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'title_reply_before' => '<h5 id="reply-title" class="discuss-title">',
</span><span class="cx" style="display: block; padding: 0 10px"> 'title_reply_after' => '</h5>',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'comment_field' => '<p class="">',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'id_form' => 'commentform-' . $comment->comment_post_ID,
</span><span class="cx" style="display: block; padding: 0 10px"> 'cancel_reply_link' => '<span></span>',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_notes_after' => implode(
</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-07-22 08:34:00 UTC (rev 11991)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers/helpers-assets/templates/translation-discussion-comments.php 2022-07-22 14:09:19 UTC (rev 11992)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -72,7 +72,7 @@
</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"> echo '<p class="comment-form-topic">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <label for="comment_topic">Topic <span class="required" aria-hidden="true">*</span></label>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <label for="comment_topic">Topic <span class="required" aria-hidden="true">*</span> (required)</label>
</ins><span class="cx" style="display: block; padding: 0 10px"> <select required name="comment_topic" id="comment_topic">
</span><span class="cx" style="display: block; padding: 0 10px"> <option value="">Select topic</option>
</span><span class="cx" style="display: block; padding: 0 10px"> <option value="typo">Typo in the English text</option>
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsgptranslationhelpersincludesclassgpnotificationsphp"></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-gp-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-gp-notifications.php 2022-07-22 08:34:00 UTC (rev 11991)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers/includes/class-gp-notifications.php 2022-07-22 14:09:19 UTC (rev 11992)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -325,10 +325,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $email_addresses The email addresses to be notified.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $email_addresses = apply_filters( 'gp_notification_before_send_emails', $email_addresses );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ( null === $comment ) || ( null === $comment_meta ) || ( empty( $email_addresses ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( null === $comment || null === $comment_meta || empty( $email_addresses ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $original = self::get_original( $comment );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $original = self::get_original( $comment );
+ if ( ! $original ) {
+ return false;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> $email_addresses = self::remove_commenter_email_address( $comment, $email_addresses );
</span><span class="cx" style="display: block; padding: 0 10px"> $email_addresses = self::remove_optout_discussion_email_addresses( $original->id, $email_addresses );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsgptranslationhelpersincludesclassgptranslationhelpersphp"></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-gp-translation-helpers.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-gp-translation-helpers.php 2022-07-22 08:34:00 UTC (rev 11991)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers/includes/class-gp-translation-helpers.php 2022-07-22 14:09:19 UTC (rev 11992)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -72,7 +72,21 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'gp_translation_row_template_more_links', array( $this, 'translation_row_template_more_links' ), 10, 5 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'preprocess_comment', array( $this, 'preprocess_comment' ) );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter(
+ 'gp_tmpl_load_locations',
+ function( $locations, $template, $args, $template_path ) {
+ if ( 'translation-row-editor-meta-status' === $template ) {
+ array_unshift( $locations, dirname( dirname( __FILE__ ) ) . '/templates/gp-templates-overrides/' );
+ } else {
+ $locations[] = dirname( dirname( __FILE__ ) ) . '/templates/';
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return $locations;
+ },
+ 60,
+ 4
+ );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->helpers = self::load_helpers();
</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">@@ -275,7 +289,7 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- gp_tmpl_load( 'translation-helpers', array( 'sections' => $sections ), dirname( __FILE__ ) . '/templates/' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ gp_tmpl_load( 'translation-helpers', array( 'sections' => $sections ) );
</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_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-07-22 08:34:00 UTC (rev 11991)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers/js/reject-feedback.js 2022-07-22 14:09:19 UTC (rev 11992)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,26 +5,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> var rowIds = [];
</span><span class="cx" style="display: block; padding: 0 10px"> var translationIds = [];
</span><span class="cx" style="display: block; padding: 0 10px"> var originalIds = [];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var feedbackForm = '<details><summary class="feedback-summary">Give feedback</summary>' +
- '<div id="feedback-form">' +
- '<form>' +
- '<h3 class="feedback-reason-title">Reason</h3>' +
- '<ul class="feedback-reason-list">' +
- getReasonList( 'single' ) +
- '</ul>' +
- '<div class="feedback-comment">' +
- '<label>Comment </label>' +
- '<textarea name="feedback_comment"></textarea>' +
- '</div>' +
- '</form>' +
- '</div>' +
- '</details>';
-
</del><span class="cx" style="display: block; padding: 0 10px"> var modalFeedbackForm =
</span><span class="cx" style="display: block; padding: 0 10px"> '<div id="reject-feedback-form" style="display:none;">' +
</span><span class="cx" style="display: block; padding: 0 10px"> '<form>' +
</span><span class="cx" style="display: block; padding: 0 10px"> '<h3>Reason</h3>' +
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- getReasonList( 'bulk' ) +
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ getReasonList() +
</ins><span class="cx" style="display: block; padding: 0 10px"> '<div class="modal-comment">' +
</span><span class="cx" style="display: block; padding: 0 10px"> '<label>Comment </label>' +
</span><span class="cx" style="display: block; padding: 0 10px"> '<textarea name="modal_feedback_comment"></textarea>' +
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -38,8 +23,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Remove click event added to <summary> by wporg-gp-customizations plugin
</span><span class="cx" style="display: block; padding: 0 10px"> $( $gp.editor.table ).off( 'click', 'summary' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $( 'button.reject' ).closest( 'dl,div.status-actions' ).prepend( feedbackForm );
-
</del><span class="cx" style="display: block; padding: 0 10px"> $( '#bulk-actions-toolbar-top .button, #bulk-actions-toolbar .button' ).click( function( e ) {
</span><span class="cx" style="display: block; padding: 0 10px"> rowIds = $( 'input:checked', $( 'table#translations th.checkbox' ) ).map( function() {
</span><span class="cx" style="display: block; padding: 0 10px"> var selectedRow = $( this ).parents( 'tr.preview' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -100,6 +83,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> rejectWithFeedback( rejectData );
</span><span class="cx" style="display: block; padding: 0 10px"> e.preventDefault();
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $( '.tooltip' ).tooltip( {
+ tooltipClass: 'hoverTooltip',
+ } );
</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">@@ -166,26 +153,19 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function getReasonList( displayType ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function getReasonList( ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> var rejectReasons = $gp_reject_feedback_settings.reject_reasons;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> var rejectList = '';
</span><span class="cx" style="display: block; padding: 0 10px"> var prefix = '';
</span><span class="cx" style="display: block; padding: 0 10px"> var suffix = '';
</span><span class="cx" style="display: block; padding: 0 10px"> var inputName = '';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( displayType === 'single' ) {
- prefix = '<li><label>';
- suffix = '</label></li>';
- inputName = 'feedback_reason';
- } else {
- prefix = '<div class="modal-item"><label>';
- suffix = '</div></label>';
- inputName = 'modal_feedback_reason';
- }
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // eslint-disable-next-line vars-on-top
</span><span class="cx" style="display: block; padding: 0 10px"> for ( var reason in rejectReasons ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- rejectList += prefix + '<input type="checkbox" name="' + inputName + '" value="' + reason + '" />' + rejectReasons[ reason ] + suffix;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ prefix = '<div class="modal-item"><label class="tooltip" title="' + rejectReasons[ reason ].explanation + '">';
+ suffix = '</label> <span class="tooltip dashicons dashicons-info" title="' + rejectReasons[ reason ].explanation + '"></span></div>';
+ inputName = 'modal_feedback_reason';
+ rejectList += prefix + '<input type="checkbox" name="' + inputName + '" value="' + reason + '" /> ' + rejectReasons[ reason ].name + suffix;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> return rejectList;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsgptranslationhelpersjstranslationhelpersjs"></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/translation-helpers.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/translation-helpers.js 2022-07-22 08:34:00 UTC (rev 11991)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers/js/translation-helpers.js 2022-07-22 14:09:19 UTC (rev 11992)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -145,4 +145,8 @@
</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">+
+ $( '.tooltip' ).tooltip( {
+ tooltipClass: 'hoverTooltip',
+ } );
</ins><span class="cx" style="display: block; padding: 0 10px"> } );
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsgptranslationhelperstemplatesdiscussionphp"></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/templates/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/templates/discussion.php 2022-07-22 08:34:00 UTC (rev 11991)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers/templates/discussion.php 2022-07-22 14:09:19 UTC (rev 11992)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,5 +28,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </h4>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php gp_tmpl_load( 'comment-section', get_defined_vars(), dirname( __FILE__ ) ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php gp_tmpl_load( 'comment-section', get_defined_vars() ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsgptranslationhelperstemplatesgptemplatesoverridestranslationroweditormetastatusphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers/templates/gp-templates-overrides/translation-row-editor-meta-status.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/templates/gp-templates-overrides/translation-row-editor-meta-status.php (rev 0)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers/templates/gp-templates-overrides/translation-row-editor-meta-status.php 2022-07-22 14:09:19 UTC (rev 11992)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,32 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * Template for the meta section of the editor row in a translation set display
+ *
+ * @package GlotPress
+ * @subpackage Templates
+ */
+
+?>
+<dl>
+ <?php gp_tmpl_load( 'translation-row-editor-meta-feedback', get_defined_vars() ); ?>
+ <dt><?php _e( 'Status:', 'glotpress' ); ?></dt>
+ <dd>
+ <?php echo display_status( $translation->translation_status ); ?>
+ <?php if ( $translation->translation_status ) : ?>
+ <?php if ( $can_approve_translation ) : ?>
+ <?php if ( 'current' !== $translation->translation_status ) : ?>
+ <button class="approve" data-nonce="<?php echo esc_attr( wp_create_nonce( 'update-translation-status-current_' . $translation->id ) ); ?>" title="<?php esc_attr_e( 'Approve this translation. Any existing translation will be kept as part of the translation history.', 'glotpress' ); ?>"><strong>+</strong> <?php _ex( 'Approve', 'Action', 'glotpress' ); ?></button>
+ <?php endif; ?>
+ <?php if ( 'rejected' !== $translation->translation_status ) : ?>
+ <button class="reject" data-nonce="<?php echo esc_attr( wp_create_nonce( 'update-translation-status-rejected_' . $translation->id ) ); ?>" title="<?php esc_attr_e( 'Reject this translation. The existing translation will be kept as part of the translation history.', 'glotpress' ); ?>"><strong>−</strong> <?php _ex( 'Reject', 'Action', 'glotpress' ); ?></button>
+ <?php endif; ?>
+ <?php if ( 'fuzzy' !== $translation->translation_status ) : ?>
+ <button class="fuzzy" data-nonce="<?php echo esc_attr( wp_create_nonce( 'update-translation-status-fuzzy_' . $translation->id ) ); ?>" title="<?php esc_attr_e( 'Mark this translation as fuzzy for further review.', 'glotpress' ); ?>"><strong>~</strong> <?php _ex( 'Fuzzy', 'Action', 'glotpress' ); ?></button>
+ <?php endif; ?>
+ <?php elseif ( $can_reject_self ) : ?>
+ <button class="reject" data-nonce="<?php echo esc_attr( wp_create_nonce( 'update-translation-status-rejected_' . $translation->id ) ); ?>" title="<?php esc_attr_e( 'Reject this translation. The existing translation will be kept as part of the translation history.', 'glotpress' ); ?>"><strong>−</strong> <?php _ex( 'Reject', 'Action', 'glotpress' ); ?></button>
+ <button class="fuzzy" data-nonce="<?php echo esc_attr( wp_create_nonce( 'update-translation-status-fuzzy_' . $translation->id ) ); ?>" title="<?php esc_attr_e( 'Mark this translation as fuzzy for further review.', 'glotpress' ); ?>"><strong>~</strong> <?php _ex( 'Fuzzy', 'Action', 'glotpress' ); ?></button>
+ <?php endif; ?>
+ <?php endif; ?>
+ </dd>
+</dl>
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers/templates/gp-templates-overrides/translation-row-editor-meta-status.php
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsgptranslationhelperstemplatesoriginalpermalinktemplatephp"></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/templates/original-permalink-template.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/templates/original-permalink-template.php 2022-07-22 08:34:00 UTC (rev 11991)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers/templates/original-permalink-template.php 2022-07-22 14:09:19 UTC (rev 11992)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -29,7 +29,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endforeach; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </summary>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php gp_tmpl_load( 'comment-section', get_defined_vars(), dirname( __FILE__ ) ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php gp_tmpl_load( 'comment-section', get_defined_vars() ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> </details>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsgptranslationhelperstemplatestranslationroweditormetafeedbackphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers/templates/translation-row-editor-meta-feedback.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/templates/translation-row-editor-meta-feedback.php (rev 0)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers/templates/translation-row-editor-meta-feedback.php 2022-07-22 14:09:19 UTC (rev 11992)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,25 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php if ( ! $can_approve_translation || ! $translation->translation_status ) {
+ return;
+} ?>
+<details>
+ <summary class="feedback-summary">Give feedback</summary>
+ <div id="feedback-form">
+ <form>
+ <h3 class="feedback-reason-title">Reason</h3>
+ <ul class="feedback-reason-list">
+ <?php
+ $reject_reasons = Helper_Translation_Discussion::get_reject_reasons();
+ foreach ( $reject_reasons as $key => $reason ) :
+ ?>
+ <li>
+ <label class="tooltip" title="<?php echo esc_attr( $reason['explanation'], 'glotpress' ); ?>"><input type="checkbox" name="feedback_reason" value="<?php echo esc_attr( $key, 'glotpress' ); ?>" /><?php echo esc_html( $reason['name'], 'glotpress' ); ?></label><span class="tooltip dashicons dashicons-info" title="<?php echo esc_attr( $reason['explanation'], 'glotpress' ); ?>"></span>
+ </li>
+ <?php endforeach; ?>
+ </ul>
+ <div class="feedback-comment">
+ <label>Comment </label>
+ <textarea name="feedback_comment"></textarea>
+ </div>
+ </form>
+ </div>
+</details>
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers/templates/translation-row-editor-meta-feedback.php
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span></div>
</body>
</html>