<!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][880] trunk: Branching: fix an issue where translations original id was set to the original project originals.</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">
<dt>Revision</dt> <dd><a href="https://glotpress.trac.wordpress.org/changeset/880">880</a></dd>
<dt>Author</dt> <dd>yoavf</dd>
<dt>Date</dt> <dd>2014-04-29 06:47:39 +0000 (Tue, 29 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Branching: fix an issue where translations original id was set to the original project originals. Add CLI script to perform branching. See <a href="http://glotpress.trac.wordpress.org/ticket/65">#65</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkgpincludesthingstranslationsetphp">trunk/gp-includes/things/translation-set.php</a></li>
<li><a href="#trunktteststests_thingstest_thing_projectphp">trunk/t/tests/tests_things/test_thing_project.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkscriptsbranchprojectphp">trunk/scripts/branch-project.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkgpincludesthingstranslationsetphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-includes/things/translation-set.php (879 => 880)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-includes/things/translation-set.php 2014-04-29 06:46:41 UTC (rev 879)
+++ trunk/gp-includes/things/translation-set.php 2014-04-29 06:47:39 UTC (rev 880)
</span><span class="lines">@@ -150,20 +150,37 @@
</span><span class="cx"> * Copies translations from a translation set to the current one
</span><span class="cx"> *
</span><span class="cx"> * This function doesn't merge then, just copies unconditionally. If a translation already exists, it will be duplicated.
</span><ins>+ * When copying translations from another project, it will search to find the original first.
</ins><span class="cx"> */
</span><span class="cx"> function copy_translations_from( $source_translation_set_id ) {
</span><span class="cx"> global $gpdb;
</span><span class="cx"> $current_date = $this->now_in_mysql_format();
</span><del>- return $this->query("
- INSERT INTO $gpdb->translations (
- original_id, translation_set_id, translation_0, translation_1, translation_2, user_id, status, date_added, date_modified, warnings
- )
- SELECT
- original_id, %s AS translation_set_id, translation_0, translation_1, translation_2, user_id, status, date_added, %s AS date_modified, warnings
- FROM $gpdb->translations WHERE translation_set_id = %s", $this->id, $current_date, $source_translation_set_id
- );
</del><ins>+
+ $source_set = GP::$translation_set->get( $source_translation_set_id );
+ if ( $source_set->project_id != $this->project_id ) {
+ $translations = GP::$translation->find_many( "translation_set_id = '{$source_set->id}'" );
+ foreach ( $translations as $entry ) {
+ $source_original = GP::$original->get( $entry->original_id );
+ $original = GP::$original->by_project_id_and_entry( $this->project_id, $source_original );
+ if ( $original ) {
+ $entry->original_id = $original->id;
+ $entry->translation_set_id = $this->id;
+ $translation = GP::$translation->create( $entry );
+ }
+ }
+ } else {
+ return $this->query( "
+ INSERT INTO $gpdb->translations (
+ original_id, translation_set_id, translation_0, translation_1, translation_2, user_id, status, date_added, date_modified, warnings
+ )
+ SELECT
+ original_id, %s AS translation_set_id, translation_0, translation_1, translation_2, user_id, status, date_added, %s AS date_modified, warnings
+ FROM $gpdb->translations WHERE translation_set_id = %s", $this->id, $current_date, $source_translation_set_id
+ );
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> function percent_translated() {
</span><span class="cx"> $original_count = GP::$original->count_by_project_id( $this->project_id );
</span><span class="cx"> return sprintf( _x( '%d%%', 'language translation percent' ), $original_count ? $this->current_count() / $original_count * 100 : 0 );
</span></span></pre></div>
<a id="trunkscriptsbranchprojectphp"></a>
<div class="addfile"><h4>Added: trunk/scripts/branch-project.php (0 => 880)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/scripts/branch-project.php (rev 0)
+++ trunk/scripts/branch-project.php 2014-04-29 06:47:39 UTC (rev 880)
</span><span class="lines">@@ -0,0 +1,30 @@
</span><ins>+<?php
+require_once dirname( dirname( __FILE__ ) ) . '/gp-load.php';
+
+class GP_Script_Branch_Project extends GP_CLI {
+
+ var $short_options = 's:d:';
+
+ var $usage = "-s <source project-path> -d <desination project-path>";
+
+ function run() {
+ if ( ! isset( $this->options['s'] ) || !isset( $this->options['d'] ) ) {
+ $this->usage();
+ }
+ $source_project = GP::$project->by_path( $this->options['s'] );
+ if ( ! $source_project ){
+ $this->error( __('Source project not found!') );
+ }
+
+ $destination_project = GP::$project->by_path( $this->options['d'] );
+ if ( ! $destination_project ){
+ $this->error( __('Destination project not found!') );
+ }
+
+ $destination_project->duplicate_project_contents_from( $source_project );
+
+ }
+}
+
+$gp_script_import_originals = new GP_Script_Branch_Project;
+$gp_script_import_originals->run();
</ins><span class="cx">Property changes on: trunk/scripts/branch-project.php
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnexecutable"></a>
<div class="addfile"><h4>Added: svn:executable</h4></div>
<ins>+*
</ins><span class="cx">\ No newline at end of property
</span><a id="trunktteststests_thingstest_thing_projectphp"></a>
<div class="modfile"><h4>Modified: trunk/t/tests/tests_things/test_thing_project.php (879 => 880)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/t/tests/tests_things/test_thing_project.php 2014-04-29 06:46:41 UTC (rev 879)
+++ trunk/t/tests/tests_things/test_thing_project.php 2014-04-29 06:47:39 UTC (rev 880)
</span><span class="lines">@@ -147,6 +147,7 @@
</span><span class="cx"> $this->factory->translation->create_with_original_for_translation_set( $original );
</span><span class="cx">
</span><span class="cx"> $copy = $this->factory->project->create( array( 'name' => 'branch' ) );
</span><ins>+ $copy->copy_originals_from( $original->project->id );
</ins><span class="cx"> $copy->copy_sets_and_translations_from( $original->project->id );
</span><span class="cx">
</span><span class="cx"> $copy_set = array_shift( GP::$translation_set->by_project_id( $copy->id ) );
</span><span class="lines">@@ -154,8 +155,10 @@
</span><span class="cx"> $original_translation = array_shift( GP::$translation->find( array( 'translation_set_id' => $original->id ) ) );
</span><span class="cx"> $copy_translation = array_shift( GP::$translation->find( array( 'translation_set_id' => $copy_set->id ) ) );
</span><span class="cx">
</span><ins>+ $this->assertNotEquals( $original_translation->original_id, $copy_translation->original_id );
+
</ins><span class="cx"> $this->assertEqualFields( $copy_translation,
</span><del>- array( 'translation_0' => $original_translation->translation_0, 'date_added' => $original_translation->date_added, 'original_id' => $original_translation->original_id )
</del><ins>+ array( 'translation_0' => $original_translation->translation_0, 'date_added' => $original_translation->date_added )
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>