<!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>[GlotPress][1095] trunk: Improve translation memory loop for cross project translations matching.</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 { 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="https://glotpress.trac.wordpress.org/changeset/1095">1095</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://glotpress.trac.wordpress.org/changeset/1095","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>ocean90</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-07-22 18:17:49 +0000 (Wed, 22 Jul 2015)</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'>Improve translation memory loop for cross project translations matching.
* Combines the queries for matching originals in other projects, translation sets and translations into one SQL query.
* Adds unit tests.
props dd32, markoheijnen, yoavf, ocean90.
see <a href="http://glotpress.trac.wordpress.org/ticket/327">#327</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkgpincludesthingsoriginalphp">trunk/gp-includes/things/original.php</a></li>
<li><a href="#trunktlibfactoryphp">trunk/t/lib/factory.php</a></li>
<li><a href="#trunktteststests_thingstest_thing_originalphp">trunk/t/tests/tests_things/test_thing_original.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkgpincludesthingsoriginalphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/gp-includes/things/original.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/gp-includes/things/original.php 2015-07-21 19:51:39 UTC (rev 1094)
+++ trunk/gp-includes/things/original.php 2015-07-22 18:17:49 UTC (rev 1095)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -261,56 +261,50 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function add_translations_from_other_projects() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $gpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $other_projects_originals = $this->get_matching_originals_in_other_projects();
- if ( ! $other_projects_originals ) {
- return;
- }
-
- $matched_sets = array();
-
</del><span class="cx" style="display: block; padding: 0 10px"> $project_translations_sets = GP::$translation_set->many_no_map( "SELECT * FROM $gpdb->translation_sets WHERE project_id = %d", $this->project_id );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $project_translations_sets ) ) {
</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">- foreach ( $other_projects_originals as $o ) {
- $current_translations = GP::$translation->many( "SELECT * FROM $gpdb->translations WHERE original_id = %d AND status = %s ORDER by date_modified DESC", $o->id, 'current' );
- if ( ! $current_translations ) {
- continue;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $matched_sets = array();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach ( $current_translations as $t ) {
- if ( ! $t->translation_set_id ) {
- continue;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $sql_project = $gpdb->prepare( 'o.project_id != %d', $this->project_id );
+ $sql_singular = $gpdb->prepare( 'o.singular = BINARY %s', $this->singular );
+ $sql_plural = is_null( $this->plural ) ? 'o.plural IS NULL' : $gpdb->prepare( 'o.plural = BINARY %s', $this->plural );
+ $sql_context = is_null( $this->context ) ? 'o.context IS NULL' : $gpdb->prepare( 'o.context = BINARY %s', $this->context );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t_translation_set = GP::$translation_set->get( $t->translation_set_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $sql = "SELECT t.*, s.locale, s.slug
+ FROM {$this->table} o
+ JOIN {$gpdb->translations} t ON o.id = t.original_id
+ JOIN {$gpdb->translation_sets} s ON t.translation_set_id = s.id
+ WHERE
+ $sql_context AND $sql_singular AND $sql_plural
+ AND o.status = '+active' AND $sql_project
+ AND t.status = 'current'
+ GROUP BY t.translation_0, t.translation_1, t.translation_2, t.translation_3, t.translation_4, t.translation_5, s.locale, s.slug
+ ORDER BY t.date_modified DESC, t.id DESC";
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $t_translation_set ) {
- continue;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $other_project_translations = GP::$translation->many( $sql );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $o_translation_set = array_filter( $project_translations_sets, function( $set ) use ( $t_translation_set ) {
- return $set->locale == $t_translation_set->locale && $set->slug == $t_translation_set->slug;
- } );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $other_project_translations as $t ) {
+ $o_translation_set = array_filter( $project_translations_sets, function( $set ) use ( $t ) {
+ return $set->locale == $t->locale && $set->slug == $t->slug;
+ } );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( empty( $o_translation_set ) ) {
- continue;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $o_translation_set ) ) {
+ continue;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $o_translation_set = reset( $o_translation_set );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $o_translation_set = reset( $o_translation_set );
+ if ( in_array( $o_translation_set->id, $matched_sets ) ) {
+ // We already have a translation for this set.
+ continue;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $o_translation_set->id, $matched_sets ) ) {
- // We already have a translation for this set.
- continue;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $matched_sets[] = $o_translation_set->id;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $matched_sets[] = $o_translation_set->id;
-
- $copy_status = apply_filters( 'translations_from_other_projects_status', 'current' );
- $t->copy_into_set( $o_translation_set->id, $this->id, $copy_status );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $copy_status = apply_filters( 'translations_from_other_projects_status', 'current' );
+ $t->copy_into_set( $o_translation_set->id, $this->id, $copy_status );
</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="trunktlibfactoryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/t/lib/factory.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/t/lib/factory.php 2015-07-21 19:51:39 UTC (rev 1094)
+++ trunk/t/lib/factory.php 2015-07-22 18:17:49 UTC (rev 1095)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -52,6 +52,13 @@
</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">+ function create_with_project( $args = array(), $project_args = array() ) {
+ $project = $this->factory->project->create( $project_args );
+ $set = $this->create( array( 'project_id' => $project->id ) + $args );
+ $set->project = $project;
+ return $set;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> function create_with_project_and_locale( $args = array(), $project_args = array() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $locale = $this->factory->locale->create();
</span><span class="cx" style="display: block; padding: 0 10px"> $project = $this->factory->project->create( $project_args );
</span></span></pre></div>
<a id="trunktteststests_thingstest_thing_originalphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/t/tests/tests_things/test_thing_original.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/t/tests/tests_things/test_thing_original.php 2015-07-21 19:51:39 UTC (rev 1094)
+++ trunk/t/tests/tests_things/test_thing_original.php 2015-07-22 18:17:49 UTC (rev 1095)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -130,7 +130,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $normalized_args = $original->normalize_fields( array( 'priority' => 'baba' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( isset( $normalized_args['priority'] ) );
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> function test_by_project_id_and_entry_should_match_case() {
</span><span class="cx" style="display: block; padding: 0 10px"> $project = $this->factory->project->create();
</span><span class="cx" style="display: block; padding: 0 10px"> $original = $this->factory->original->create( array( 'project_id' => $project->id, 'status' => '+active', 'singular' => 'Baba' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -145,4 +145,76 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $by_project_id_and_entry = GP::$original->by_project_id_and_entry( $project->id, $entry );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $original->singular, $by_project_id_and_entry->singular );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * @ticket 327
+ */
+ function test_add_translations_from_other_projects() {
+ $set1 = $this->factory->translation_set->create_with_project_and_locale( array(), array( 'name' => 'project_one' ) );
+ $set2 = $this->factory->translation_set->create_with_project( array( 'locale' => $set1->locale ), array( 'name' => 'project_two' ) );
+
+ $original1 = $this->factory->original->create( array( 'project_id' => $set1->project_id, 'status' => '+active', 'singular' => 'baba' ) );
+ $original2 = $this->factory->original->create( array( 'project_id' => $set1->project_id, 'status' => '+active', 'singular' => 'bubu' ) );
+
+ $translation1 = $this->factory->translation->create( array( 'translation_set_id' => $set1->id, 'original_id' => $original1->id, 'status' => 'current' ) );
+ $translation2 = $this->factory->translation->create( array( 'translation_set_id' => $set1->id, 'original_id' => $original2->id, 'status' => 'waiting' ) );
+
+ $original1 = $this->factory->original->create( array( 'project_id' => $set2->project_id, 'status' => '+active', 'singular' => 'baba' ) );
+ $original2 = $this->factory->original->create( array( 'project_id' => $set2->project_id, 'status' => '+active', 'singular' => 'bubu' ) );
+
+ $original1->add_translations_from_other_projects();
+ $original2->add_translations_from_other_projects();
+
+ $set2_current_translations = GP::$translation->for_export( $set2->project, $set2, array( 'status' => 'current' ) );
+ $this->assertEquals( 1, count( $set2_current_translations ) );
+ }
+
+ /**
+ * @ticket 327
+ */
+ function test_add_translations_from_other_projects_with_placeholders_in_original() {
+ $set1 = $this->factory->translation_set->create_with_project_and_locale( array(), array( 'name' => 'project_one' ) );
+ $set2 = $this->factory->translation_set->create_with_project( array( 'locale' => $set1->locale ), array( 'name' => 'project_two' ) );
+
+ $original1 = $this->factory->original->create( array( 'project_id' => $set1->project_id, 'status' => '+active', 'singular' => '%s baba', 'plural' => '%s babas' ) );
+ $translation1 = $this->factory->translation->create( array( 'translation_set_id' => $set1->id, 'original_id' => $original1->id, 'status' => 'current' ) );
+
+ $original2 = $this->factory->original->create( array( 'project_id' => $set2->project_id, 'status' => '+active', 'singular' => '%s baba', 'plural' => '%s babas' ) );
+ $original2->add_translations_from_other_projects();
+
+ $set2_current_translations = GP::$translation->for_export( $set2->project, $set2, array( 'status' => 'current' ) );
+ $this->assertEquals( 1, count( $set2_current_translations ) );
+ $this->assertEquals( $translation1->translation_0, $set2_current_translations[0]->translations[0] );
+ }
+
+ /**
+ * @ticket 327
+ */
+ function test_add_translations_from_other_projects_not_creating_duplicate_translations() {
+ $set1 = $this->factory->translation_set->create_with_project_and_locale( array(), array( 'name' => 'project_one' ) );
+ $set2 = $this->factory->translation_set->create_with_project( array( 'locale' => $set1->locale ), array( 'name' => 'project_two' ) );
+ $set3 = $this->factory->translation_set->create_with_project( array( 'locale' => $set1->locale ), array( 'name' => 'project_three' ) );
+ $set4 = $this->factory->translation_set->create_with_project( array( 'locale' => $set1->locale ), array( 'name' => 'project_four' ) );
+
+ // Insert first original with a waiting translation in project 1.
+ $original1 = $this->factory->original->create( array( 'project_id' => $set1->project_id, 'status' => '+active', 'singular' => 'baba' ) );
+ $translation1 = $this->factory->translation->create( array( 'translation_set_id' => $set1->id, 'original_id' => $original1->id, 'status' => 'waiting' ) );
+
+ // Insert the same original with a current translation in project 2.
+ $original2 = $this->factory->original->create( array( 'project_id' => $set2->project_id, 'status' => '+active', 'singular' => 'baba' ) );
+ $translation2 = $this->factory->translation->create( array( 'translation_set_id' => $set2->id, 'original_id' => $original2->id, 'status' => 'current' ) );
+
+ // Insert the same original with a current translation in project 3.
+ $original3 = $this->factory->original->create( array( 'project_id' => $set3->project_id, 'status' => '+active', 'singular' => 'baba' ) );
+ $translation3 = $this->factory->translation->create( array( 'translation_set_id' => $set3->id, 'original_id' => $original3->id, 'status' => 'current' ) );
+
+ // Insert the same original with no translation in project 4.
+ $original4 = $this->factory->original->create( array( 'project_id' => $set4->project_id, 'status' => '+active', 'singular' => 'baba' ) );
+ $original4->add_translations_from_other_projects();
+
+ // The translation of the fourth original should be equal with the translation in project 3, because it's the newest.
+ $set4_current_translations = GP::$translation->for_export( $set4->project, $set4, array( 'status' => 'current' ) );
+ $this->assertEquals( 1, count( $set4_current_translations ) );
+ $this->assertEquals( $translation3->translation_0, $set4_current_translations[0]->translations[0] );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>