<!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>[12874] sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers: Translate: Sync gp-translation-helpers with GitHub</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/12874">12874</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/12874","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>2023-09-04 13:30:28 +0000 (Mon, 04 Sep 2023)</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: Sync gp-translation-helpers with GitHub</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsgptranslationhelperscsstranslationhelperscss">sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers/css/translation-helpers.css</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsgptranslationhelpershelpershelperotherlocalesphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers/helpers/helper-other-locales.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsgptranslationhelpershelpershelpertranslationhistoryphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers/helpers/helper-translation-history.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsgptranslationhelperscsstranslationhelperscss"></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/translation-helpers.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/translation-helpers.css 2023-08-31 10:50:11 UTC (rev 12873)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers/css/translation-helpers.css 2023-09-04 13:30:28 UTC (rev 12874)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -83,6 +83,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> border: 1px solid rgb(0 0 0 / 5%);
</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">+#translation-history-table ul {
+ margin-left: -1rem;
+}
+#translation-history-table li:not(:last-child){
+ margin-bottom: 0.5rem;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> footer em {
</span><span class="cx" style="display: block; padding: 0 10px"> margin-left: 14px;
</span><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_htmlwpcontentpluginsgptranslationhelpershelpershelperotherlocalesphp"></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-other-locales.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-other-locales.php 2023-08-31 10:50:11 UTC (rev 12873)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers/helpers/helper-other-locales.php 2023-09-04 13:30:28 UTC (rev 12874)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -32,6 +32,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public $has_async_content = true;
</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">+ * Indicates the related locales for each locale, so we will put them in the top list
+ * of "Other locales".
+ *
+ * This array should be sync with
+ * https://github.com/WordPress/wordpress.org/blob/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-translation-suggestions/inc/routes/class-other-languages.php
+ *
+ * @since 0.0.1
+ * @var array
+ */
+ public array $related_locales = array(
+ 'gl' => array( 'es', 'pt', 'pt-ao', 'pt-br', 'ca', 'it', 'fr', 'ro' ),
+ 'es' => array( 'gl', 'ca', 'pt', 'pt-ao', 'pt-br', 'it', 'fr', 'ro' ),
+ );
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Activates the helper.
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -66,13 +81,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $translation_set = GP::$translation_set->by_project_id_slug_and_locale( $this->data['project_id'], $this->data['translation_set_slug'], $this->data['locale_slug'] );
</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">- $translations = GP::$translation->find_many_no_map(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $translations = GP::$translation->find_many_no_map(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'status' => 'current',
</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"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $translations_by_locale = array();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $translations_by_locale = array();
+ $translations_by_locale_with_preference = array();
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $translations as $translation ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $_set = GP::$translation_set->get( $translation->translation_set_id );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $_set || ( $translation_set && intval( $translation->translation_set_id ) === intval( $translation_set->id ) ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -83,7 +99,26 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> ksort( $translations_by_locale );
</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 $translations_by_locale;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Put the variants in the top list.
+ foreach ( $translations_by_locale as $key => $translation ) {
+ // phpcs:ignore WordPress.PHP.YodaConditions.NotYoda
+ if ( explode( '-', $key )[0] === explode( '-', $this->data['locale_slug'] )[0] ) {
+ $translations_by_locale_with_preference[ $key ] = $translation;
+ unset( $translations_by_locale[ $key ] );
+ }
+ }
+
+ // Put the related locales in the top list, after the variants.
+ if ( ! empty( $this->related_locales[ $this->data['locale_slug'] ] ) ) {
+ foreach ( $this->related_locales[ $this->data['locale_slug'] ] as $locale ) {
+ if ( array_key_exists( $locale, $translations_by_locale ) ) {
+ $translations_by_locale_with_preference[ $locale ] = $translations_by_locale[ $locale ];
+ unset( $translations_by_locale[ $locale ] );
+ }
+ }
+ }
+
+ return array_merge( $translations_by_locale_with_preference, $translations_by_locale );
</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_htmlwpcontentpluginsgptranslationhelpershelpershelpertranslationhistoryphp"></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-history.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-history.php 2023-08-31 10:50:11 UTC (rev 12873)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers/helpers/helper-translation-history.php 2023-09-04 13:30:28 UTC (rev 12874)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -121,7 +121,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> is_null( $translation->translation_4 ) &&
</span><span class="cx" style="display: block; padding: 0 10px"> is_null( $translation->translation_5 )
</span><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $output_translation = $translation->translation_0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $output_translation = esc_translation( $translation->translation_0 );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $output_translation = '<ul>';
</span><span class="cx" style="display: block; padding: 0 10px"> for ( $i = 0; $i <= 5; $i ++ ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -137,7 +137,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> esc_attr( $translation->status ),
</span><span class="cx" style="display: block; padding: 0 10px"> esc_attr( $translation->date_modified ?? $translation->date_added ),
</span><span class="cx" style="display: block; padding: 0 10px"> esc_html( $date_and_time[0] ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $translation_permalink ? '<a href="' . esc_url( $translation_permalink ) . '">' . esc_html( $output_translation ) . '</a>' : esc_html( $output_translation ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+ $translation_permalink ? '<a href="' . esc_url( $translation_permalink ) . '">' . $output_translation . '</a>' : $output_translation,
</ins><span class="cx" style="display: block; padding: 0 10px"> $user ? esc_html( $user->user_login ) : '—',
</span><span class="cx" style="display: block; padding: 0 10px"> $user_last_modified ? esc_html( $user_last_modified->user_login ) : '—'
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span></span></pre>
</div>
</div>
</body>
</html>