<!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][1097] trunk: Add filters to disable cross project translations matching and propagating.</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/1097">1097</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/1097","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 20:39:39 +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'>Add filters to disable cross project translations matching and propagating.
Updates `GP_Script_Import_Originals` to support `--disable-propagating` and `--disable-matching` and `GP_Script_Import` to support `--disable-propagating`.
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="#trunkgpincludesthingstranslationphp">trunk/gp-includes/things/translation.php</a></li>
<li><a href="#trunkscriptsimportoriginalsphp">trunk/scripts/import-originals.php</a></li>
<li><a href="#trunkscriptsimportphp">trunk/scripts/import.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-22 19:11:17 UTC (rev 1096)
+++ trunk/gp-includes/things/original.php 2015-07-22 20:39:39 UTC (rev 1097)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -159,7 +159,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> } else { // Completely new string
</span><span class="cx" style="display: block; padding: 0 10px"> $created = GP::$original->create( $data );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $created->add_translations_from_other_projects();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( apply_filters( 'enable_add_translations_from_other_projects', true ) ) {
+ $created->add_translations_from_other_projects();
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $originals_added++;
</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="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 2015-07-22 19:11:17 UTC (rev 1096)
+++ trunk/gp-includes/things/translation.php 2015-07-22 20:39:39 UTC (rev 1097)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -224,7 +224,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array('original_id' => $this->original_id, 'translation_set_id' => $this->translation_set_id, 'status' => 'fuzzy') )
</span><span class="cx" style="display: block; padding: 0 10px"> && $this->update( array('status' => 'current') );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->propagate_across_projects();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( apply_filters( 'enable_propagate_translations_across_projects', true ) ) {
+ $this->propagate_across_projects();
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $result;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunkscriptsimportoriginalsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/scripts/import-originals.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/scripts/import-originals.php 2015-07-22 19:11:17 UTC (rev 1096)
+++ trunk/scripts/import-originals.php 2015-07-22 20:39:39 UTC (rev 1097)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3,14 +3,19 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> class GP_Script_Import_Originals extends GP_CLI {
</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 $short_options = 'p:f:o:';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public $short_options = 'p:f:o:';
+ public $long_options = array(
+ 'disable-propagating',
+ 'disable-matching',
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var $usage = "-p <project-path> -f <file> [-o <format>]";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public $usage = "-p <project-path> -f <file> [-o <format>] [--disable-propagating] [--disable-matching]";
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function run() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !isset( $this->options['p'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->usage();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $project = GP::$project->by_path( $this->options['p'] );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !$project ) $this->error( __('Project not found!') );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,7 +27,25 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->error( __("Couldn't load translations from file!") );
</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">+ $disable_propagating = isset( $this->options['disable-propagating'] );
+ $disable_matching = isset( $this->options['disable-matching'] );
+
+ if ( $disable_propagating ) {
+ add_filter( 'enable_propagate_translations_across_projects', '__return_false' );
+ }
+ if ( $disable_matching ) {
+ add_filter( 'enable_add_translations_from_other_projects', '__return_false' );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> list( $originals_added, $originals_existing, $originals_fuzzied, $originals_obsoleted ) = GP::$original->import_for_project( $project, $translations );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( $disable_matching ) {
+ remove_filter( 'enable_add_translations_from_other_projects', '__return_false' );
+ }
+ if ( $disable_propagating ) {
+ remove_filter( 'enable_propagate_translations_across_projects', '__return_false' );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><span class="cx" style="display: block; padding: 0 10px"> __( '%1$s new strings added, %2$s updated, %3$s fuzzied, and %4$s obsoleted.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> $originals_added,
</span></span></pre></div>
<a id="trunkscriptsimportphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/scripts/import.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/scripts/import.php 2015-07-22 19:11:17 UTC (rev 1096)
+++ trunk/scripts/import.php 2015-07-22 20:39:39 UTC (rev 1097)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3,16 +3,31 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> class GP_Script_Import extends GP_Translation_Set_Script {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public $long_options = array(
+ 'disable-propagating',
+ );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> function __construct() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->short_options .= 'f:';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->usage = '-f <po-file> '.$this->usage;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->usage = '-f <po-file> ' . $this->usage . ' [--disable-propagating]';
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::__construct();
</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"> function action_on_translation_set( $translation_set ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $po = new PO();
</span><span class="cx" style="display: block; padding: 0 10px"> $po->import_from_file( $this->options['f'] );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $disable_propagating = isset( $this->options['disable-propagating'] );
+ if ( $disable_propagating ) {
+ add_filter( 'enable_propagate_translations_across_projects', '__return_false' );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $added = $translation_set->import( $po );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( $disable_propagating ) {
+ remove_filter( 'enable_propagate_translations_across_projects', '__return_false' );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> printf( _n( "%s translation were added\n", "%s translations were added\n", $added ), $added );
</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>