<!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][1178] trunk: Translation Propagation: Set a waiting translation as current if it's the same translation which gets propagated.</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/1178">1178</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/1178","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>2016-02-21 22:24:31 +0000 (Sun, 21 Feb 2016)</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'>Translation Propagation: Set a waiting translation as current if it's the same translation which gets propagated.
See <a href="http://glotpress.trac.wordpress.org/ticket/327">#327</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkgpincludesthingstranslationphp">trunk/gp-includes/things/translation.php</a></li>
<li><a href="#trunktteststests_thingstest_thing_translationphp">trunk/t/tests/tests_things/test_thing_translation.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkgpincludesthingstranslationphp"></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/translation.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/gp-includes/things/translation.php 2016-02-16 11:33:48 UTC (rev 1177)
+++ trunk/gp-includes/things/translation.php 2016-02-21 22:24:31 UTC (rev 1178)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -234,14 +234,18 @@
</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">- if ( in_array( $status, array( 'waiting', 'fuzzy' ) ) ) {
- $new_translation_set = GP::$translation_set->get( $new_translation_set_id );
- $locale = GP_Locales::by_slug( $new_translation_set->locale );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $new_translation_set = GP::$translation_set->get( $new_translation_set_id );
+ $locale = GP_Locales::by_slug( $new_translation_set->locale );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- for ( $i = 0; $i < $locale->nplurals; $i++ ) {
- $new_translation[] = $this->{"translation_{$i}"};
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ for ( $i = 0; $i < $locale->nplurals; $i++ ) {
+ $new_translation[] = $this->{"translation_{$i}"};
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Don't propagate a waiting/fuzzy translation if the same translation
+ * with the same status exists already.
+ */
+ if ( in_array( $status, array( 'waiting', 'fuzzy' ) ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $existing_translations = GP::$translation->find_no_map( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'translation_set_id' => $new_translation_set_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'original_id' => $new_original_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -260,6 +264,36 @@
</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">+ /*
+ * Set a waiting translation as current if it's the same translation.
+ */
+ if ( 'current' === $status ) {
+ $existing_translations = GP::$translation->find( array(
+ 'translation_set_id' => $new_translation_set_id,
+ 'original_id' => $new_original_id,
+ 'status' => 'waiting',
+ ) );
+
+ foreach ( $existing_translations as $existing_translation ) {
+ $translation = array();
+ for ( $i = 0; $i < $locale->nplurals; $i++ ) {
+ $translation[] = $existing_translation->{"translation_{$i}"};
+ }
+
+ if ( $translation == $new_translation ) {
+ // Mark as current and avoid recursion.
+ add_filter( 'enable_propagate_translations_across_projects', '__return_false' );
+ $existing_translation->set_as_current();
+ remove_filter( 'enable_propagate_translations_across_projects', '__return_false' );
+ return;
+ }
+ }
+ }
+
+ /*
+ * If none of the above cases are matching, copy the same translation
+ * into the new translation set.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> $copy = new GP_Translation( $this->fields() );
</span><span class="cx" style="display: block; padding: 0 10px"> $copy->original_id = $new_original_id;
</span><span class="cx" style="display: block; padding: 0 10px"> $copy->translation_set_id = $new_translation_set_id;
</span></span></pre></div>
<a id="trunktteststests_thingstest_thing_translationphp"></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_translation.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/t/tests/tests_things/test_thing_translation.php 2016-02-16 11:33:48 UTC (rev 1177)
+++ trunk/t/tests/tests_things/test_thing_translation.php 2016-02-21 22:24:31 UTC (rev 1178)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -248,7 +248,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $original1 = $this->factory->original->create( array( 'project_id' => $set1->project_id, 'status' => '+active', 'singular' => 'baba' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $original2 = $this->factory->original->create( array( 'project_id' => $set2->project_id, 'status' => '+active', 'singular' => 'baba' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $translation1 = $this->factory->translation->create( array( 'translation_set_id' => $set1->id, 'original_id' => $original1->id, 'status' => 'current' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $translation1 = $this->factory->translation->create( array( 'translation_set_id' => $set1->id, 'original_id' => $original1->id, 'user_id' => $user->id, 'status' => 'current' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add the same translation as waiting to another set.
</span><span class="cx" style="display: block; padding: 0 10px"> $translation_waiting = $translation1->fields();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -264,5 +264,37 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $set2_current_translations = GP::$translation->for_export( $project2, $set2, array( 'status' => 'waiting' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 1, count( $set2_current_translations ) );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $this->assertEquals( $set2_current_translations[0]->user_login, $user->user_login );
+
</ins><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_copy_into_set_uses_equal_waiting_translations() {
+ $set1 = $this->factory->translation_set->create_with_project_and_locale( array( 'locale' => 'bg' ), array( 'name' => 'project_one' ) );
+ $project2 = $this->factory->project->create( array( 'name'=>'project_two' ) );
+ $set2 = $this->factory->translation_set->create( array( 'locale' => $set1->locale, 'project_id' => $project2->id ) );
+
+ $original1 = $this->factory->original->create( array( 'project_id' => $set1->project_id, 'status' => '+active', 'singular' => 'baba' ) );
+ $original2 = $this->factory->original->create( array( 'project_id' => $set2->project_id, 'status' => '+active', 'singular' => 'baba' ) );
+
+ $translation1 = $this->factory->translation->create( array( 'translation_set_id' => $set1->id, 'original_id' => $original1->id ) );
+
+ // Add the same translation as waiting to another set.
+ $translation_waiting = $translation1->fields();
+ $translation_waiting[ 'translation_set_id' ] = $set2->id;
+ $translation_waiting[ 'original_id' ] = $original2->id;
+ $translation_waiting[ 'status' ] = 'waiting';
+ $translation2 = $this->factory->translation->create( $translation_waiting );
+
+ $translation1->copy_into_set( $set2->id, $original2->id, 'current' );
+
+ $set2_current_translations = GP::$translation->for_export( $project2, $set2, array( 'status' => 'current' ) );
+ $this->assertEquals( 1, count( $set2_current_translations ) );
+
+ $set2_current_translations = GP::$translation->for_export( $project2, $set2, array( 'status' => 'waiting' ) );
+ $this->assertEquals( 0, count( $set2_current_translations ) );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>