<!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][1176] trunk: Translation Propagation: Change the default status to waiting.</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/1176">1176</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/1176","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-16 11:14:08 +0000 (Tue, 16 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: Change the default status to waiting.
* Using "current" as the default status is leveraging the permission system.
* Use only "current" if the current user can approve translations in the new translation set.
* Don't propagate a translation if the current user isn't allowed to edit/submit translation in the new translation set.
* Pass the current translation, the ID of the new translation set and the ID of the new original to the `translations_to_other_projects_status` filter.
See https://github.com/GlotPress/GlotPress-WP/issues/247.
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-08 21:10:21 UTC (rev 1175)
+++ trunk/gp-includes/things/translation.php 2016-02-16 11:14:08 UTC (rev 1176)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -251,6 +251,7 @@
</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"> $user = GP::$user->current();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $is_user_logged_in = $user->logged_in();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $original = GP::$original->get( $this->original_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $originals_in_other_projects = $original->get_matching_originals_in_other_projects();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -270,12 +271,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $current_translation = GP::$translation->find_no_map( array( 'translation_set_id' => $o_translation_set->id, 'original_id' => $o->id, 'status' => 'current' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $current_translation ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $user->logged_in() && ! $user->can( 'approve', 'translation-set', $o_translation_set->id ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $is_user_logged_in && ! $user->can( 'edit', 'translation-set', $o_translation_set->id ) ) {
+ continue;
+ } elseif ( $is_user_logged_in && $user->can( 'approve', 'translation-set', $o_translation_set->id ) ) {
+ $copy_status = 'current';
+ } else {
</ins><span class="cx" style="display: block; padding: 0 10px"> $copy_status = 'waiting';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else {
- $copy_status = 'current';
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $copy_status = apply_filters( 'translations_to_other_projects_status', $copy_status );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $copy_status = apply_filters( 'translations_to_other_projects_status', $copy_status, $this, $o_translation_set->id, $o->id );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->copy_into_set( $o_translation_set->id, $o->id, $copy_status );
</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="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-08 21:10:21 UTC (rev 1175)
+++ trunk/t/tests/tests_things/test_thing_translation.php 2016-02-16 11:14:08 UTC (rev 1176)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -113,12 +113,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $translation1 = $this->factory->translation->create( array( 'translation_set_id' => $set1->id, 'original_id' => $original1->id, 'status' => 'current' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $translation1->set_as_current(); //calls propagate_across_projects
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $set2_current_translations = GP::$translation->for_export( $project2, $set2, array('status' => 'current') );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $set2_current_translations = GP::$translation->for_export( $project2, $set2, array( 'status' => 'waiting' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 1, count( $set2_current_translations ) );
</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 __string_status_current() {
+ return 'current';
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> function test_propagate_across_projects_propagates_case_sensitiv() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'translations_to_other_projects_status', array( $this, '__string_status_current' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $set1 = $this->factory->translation_set->create_with_project_and_locale( array( 'locale' => 'bg' ), array( 'name' => 'project_one' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $project2 = $this->factory->project->create( array( 'name'=>'project_two' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -133,9 +138,11 @@
</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' => 'current' ) );
</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">+ remove_filter( 'translations_to_other_projects_status', array( $this, '__string_status_current' ) );
</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"> function test_propagate_across_projects_propagates_ignores_translations_with_warnings() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'translations_to_other_projects_status', array( $this, '__string_status_current' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $set1 = $this->factory->translation_set->create_with_project_and_locale( array( 'locale' => 'bg' ), array( 'name' => 'project_one' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $project2 = $this->factory->project->create( array( 'name'=>'project_two' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -150,9 +157,11 @@
</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' => 'current' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 0, count( $set2_current_translations ) );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_filter( 'translations_to_other_projects_status', array( $this, '__string_status_current' ) );
</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"> function test_propagate_across_projects_does_not_create_more_than_one_current() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'translations_to_other_projects_status', array( $this, '__string_status_current' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $set1 = $this->factory->translation_set->create_with_project_and_locale( array( 'locale' => 'bg' ), array( 'name' => 'project_one' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $project2 = $this->factory->project->create( array('name'=>'project_two') );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -174,6 +183,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $set3_current_translations = GP::$translation->for_export( $project3, $set3, array('status' => 'current') );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 1, count( $set3_current_translations ) );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_filter( 'translations_to_other_projects_status', array( $this, '__string_status_current' ) );
</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>
</div>
</body>
</html>