<!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>[13068] sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-translation-suggestions/js/translation-suggestions.js: Translate: JavaScript to add a new tab to merge the "History", "Other locales" and "Translation Memory" tabs</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/13068">13068</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/13068","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-12-18 11:45:00 +0000 (Mon, 18 Dec 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: JavaScript to add a new tab to merge the "History", "Other locales" and "Translation Memory" tabs</pre>
<h3>Modified Paths</h3>
<ul>
<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_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-12-18 11:43:27 UTC (rev 13067)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-translation-suggestions/js/translation-suggestions.js 2023-12-18 11:45:00 UTC (rev 13068)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -24,11 +24,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> var DeeplTMSuggestionRequested = [];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /**
- * Stores the external translations used.
- * @type {object}
- */
- var externalSuggestion = {};
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Stores the external translations used.
+ * @type {object}
+ */
+ var externalSuggestion = {};
</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"> * Stores (caches) the "Other Languages" suggestions that has already been queried,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -62,7 +62,6 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- moveFooterToTheBottom( $container );
</del><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">@@ -85,7 +84,6 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- moveFooterToTheBottom( $container );
</del><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">@@ -188,6 +186,29 @@
</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">+ add_amount_to_others_tab = function ( sidebarTab, data, originalId ) {
+ let elements = 0;
+ if ( data?.['helper-history-' + originalId] ) {
+ elements += data['helper-history-' + originalId].count;
+ }
+ if ( data?.['helper-other-locales-' + originalId] ) {
+ elements += data['helper-other-locales-' + originalId].count;
+ }
+ var editor = $('[data-tab="' + sidebarTab + '"]').closest( '.editor' );
+ var TMcontainer = editor.find( '.suggestions__translation-memory' );
+ var elementsInTM = 0;
+ if ( TMcontainer.length ) {
+ elementsInTM += TMcontainer.find( '.translation-suggestion.with-tooltip.translation' ).length;
+ elementsInTM += TMcontainer.find( '.translation-suggestion.with-tooltip.deepl' ).length;
+ elementsInTM += TMcontainer.find( '.translation-suggestion.with-tooltip.openai' ).length;
+ }
+ elements += elementsInTM;
+ $( '#summary-translation-memory-' + originalId ).html('Translation Memory (' + elementsInTM + ')');
+
+ let content = 'Others (' + elements + ')';
+ $('[data-tab="' + sidebarTab + '"]').html( content );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Copies the translation memory to the sidebar tab and adds the number of items in the TM to the tab.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -197,18 +218,16 @@
</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();
- var divId = divSidebarWithTM.attr( 'data-row-id' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var divSidebarWithDiscussion = editor.find( '.meta.discussion' ).first();
+ var divId = divSidebarWithDiscussion.attr( 'data-row-id' );
</ins><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="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">- var itemsInTM = TMcontainer.find( '.translation-suggestion.with-tooltip.translation' ).length;
- itemsInTM += TMcontainer.find( '.translation-suggestion.with-tooltip.deepl' ).length;
- itemsInTM += TMcontainer.find( '.translation-suggestion.with-tooltip.openai' ).length;
- $( '[data-tab="sidebar-tab-translation-memory-' + divId + '"]' ).html( 'TM (' + itemsInTM + ')' );
- $( '#sidebar-div-translation-memory-' + divId ).html( TMcontainer.html() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $( '#sidebar-div-others-translation-memory-content-' + divId ).html( TMcontainer.html() );
+ console.log('sidebar-tab-others-' + divId, window.translationHelpersCache );
+ add_amount_to_others_tab('sidebar-tab-others-' + divId, window.translationHelpersCache?.[ divId ], divId);
</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">@@ -362,23 +381,6 @@
</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">- * 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 );
- }
-
- /**
</del><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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -497,18 +499,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $row ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $row.data( 'suggestion-locale' ) ) {
- externalSuggestion.suggestion_source = $row.data( 'suggestion-locale' );
- externalSuggestion.translation = $row.find( '.translation-suggestion__translation-raw' ).text();
- } else {
- externalSuggestion.suggestion_source = $row.data( 'suggestion-source' );
- externalSuggestion.translation = $row.find( '.translation-suggestion__translation' ).text();
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ externalSuggestion.suggestion_source = $row.data( 'suggestion-source' ) == 'translation' ? 'tm' : $row.data( 'suggestion-source' );
+ externalSuggestion.translation = $row.find( '.translation-suggestion__translation' ).text();
+
</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"> //Prefilter ajax requests to add external translations used to the request.
</span><span class="cx" style="display: block; padding: 0 10px"> $.ajaxPrefilter( function ( options ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! externalSuggestion || ! externalSuggestion.suggestion_source || ! externalSuggestion.translation ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ const isSuggestionUsed = Object.keys( externalSuggestion ).length > 0 ? true : false;
+
+ if ( ! externalSuggestion || ! isSuggestionUsed ) {
</ins><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"> if ( 'POST' === options.type && $gp_editor_options.url === options.url ) {
</span></span></pre>
</div>
</div>
</body>
</html>