<!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>[12873] sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-translation-suggestions: Translate: Add a link to the OpenAI and DeepL configuration</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/12873">12873</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/12873","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-08-31 10:50:11 +0000 (Thu, 31 Aug 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: Add a link to the OpenAI and DeepL configuration</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggptranslationsuggestionscsstranslationsuggestionscss">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-translation-suggestions/css/translation-suggestions.css</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggptranslationsuggestionsincclasspluginphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-translation-suggestions/inc/class-plugin.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggptranslationsuggestionsjstranslationsuggestionsjs">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-translation-suggestions/js/translation-suggestions.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggptranslationsuggestionscsstranslationsuggestionscss"></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-translation-suggestions/css/translation-suggestions.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/wporg-gp-translation-suggestions/css/translation-suggestions.css 2023-08-30 21:53:12 UTC (rev 12872)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-translation-suggestions/css/translation-suggestions.css 2023-08-31 10:50:11 UTC (rev 12873)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -103,3 +103,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> color: #000;
</span><span class="cx" style="display: block; padding: 0 10px"> background: #B5E1B9;
</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-suggestion__footer_message__for_suggestions {
+ font-size: 12px;
+}
</ins></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggptranslationsuggestionsincclasspluginphp"></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-translation-suggestions/inc/class-plugin.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-translation-suggestions/inc/class-plugin.php 2023-08-30 21:53:12 UTC (rev 12872)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-translation-suggestions/inc/class-plugin.php 2023-08-31 10:50:11 UTC (rev 12873)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -172,6 +172,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // and have no results due to being too unique.
</span><span class="cx" style="display: block; padding: 0 10px"> $query_tm = mb_strlen( $entry->singular ) <= 420;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Used to add a link to add the OpenAI and the DeepL keys.
+ // We only show this link if the user has not added any of these keys yet.
+ $gp_default_sort = get_user_option( 'gp_default_sort' );
+ $openai_key = trim( gp_array_get( $gp_default_sort, 'openai_api_key' ) );
+ $deepl_key = trim( gp_array_get( $gp_default_sort, 'deepl_api_key' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <details open class="suggestions__translation-memory<?php echo $query_tm ? '' : ' initialized'; ?>" data-nonce="<?php echo esc_attr( wp_create_nonce( 'translation-memory-suggestions-' . $entry->original_id ) ); ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <summary>Suggestions from Translation Memory</summary>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -180,6 +185,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php else : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="no-suggestions">No suggestions.</p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ <?php if ( empty( $openai_key ) && empty( $deepl_key ) ) : ?>
+ <p class="translation-suggestion__footer_message__for_suggestions">Get translation suggestions from <a href="https://translate.wordpress.org/settings/" target="_blank">OpenAI</a> and from <a href="https://translate.wordpress.org/settings/" target="_blank">DeepL</a>. <a href="https://make.wordpress.org/polyglots/2023/03/29/adding-chatgpt-and-deepl-in-the-translation-memory/" target="_blank">More info</a>.</p>
+ <?php endif; ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </details>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <details class="suggestions__other-languages" data-nonce="<?php echo esc_attr( wp_create_nonce( 'other-languages-suggestions-' . $entry->original_id ) ); ?>">
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggptranslationsuggestionsjstranslationsuggestionsjs"></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-translation-suggestions/js/translation-suggestions.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/wporg-gp-translation-suggestions/js/translation-suggestions.js 2023-08-30 21:53:12 UTC (rev 12872)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-translation-suggestions/js/translation-suggestions.js 2023-08-31 10:50:11 UTC (rev 12873)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -27,7 +27,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Stores the external translations used.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type {object}
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> var externalSuggestion = {};
</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">@@ -62,6 +62,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $container.append( cachedSuggestion );
</span><span class="cx" style="display: block; padding: 0 10px"> removeNoSuggestionsMessage( $container );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ moveFooterToTheBottom( $container );
</ins><span class="cx" style="display: block; padding: 0 10px"> copyTranslationMemoryToSidebarTab( $container );
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -84,6 +85,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $container.append( response.data );
</span><span class="cx" style="display: block; padding: 0 10px"> storeTheSuggestionInTheCache( type, originalId, response.data );
</span><span class="cx" style="display: block; padding: 0 10px"> removeNoSuggestionsMessage( $container );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ moveFooterToTheBottom( $container );
</ins><span class="cx" style="display: block; padding: 0 10px"> copyTranslationMemoryToSidebarTab( $container );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $container.append( $( '<span/>', { 'text': 'Error while loading suggestions.' } ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -195,7 +197,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function copyTranslationMemoryToSidebarTab( $container ){
</span><span class="cx" style="display: block; padding: 0 10px"> var editor = $container.closest( '.editor' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var divSidebarWithTM = editor.find( '.meta.translation-memory' ).first();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var divSidebarWithTM = editor.find( '.meta.translation-memory' ).first();
</ins><span class="cx" style="display: block; padding: 0 10px"> var divId = divSidebarWithTM.attr( 'data-row-id' );
</span><span class="cx" style="display: block; padding: 0 10px"> var TMcontainer = editor.find( '.suggestions__translation-memory' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !TMcontainer.length ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -360,6 +362,23 @@
</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">+ * Moves the footer with the link to OpenAI and DeepL to the bottom of the container.
+ *
+ * This is needed because the suggestions are loaded asynchronously.
+ *
+ * @param {object} $container The container where the suggestions are stored.
+ *
+ * @return {void}
+ */
+ function moveFooterToTheBottom( $container ) {
+ var footer = $container.find( '.translation-suggestion__footer_message__for_suggestions' );
+ if ( ! footer ) {
+ return;
+ }
+ $container.append( footer );
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Removes duplicate "No suggestions" messages.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param {object} $container The container where the suggestions are stored.
</span></span></pre>
</div>
</div>
</body>
</html>