<!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][921] trunk: Import "fuzzy" flag.</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/921">921</a></dd>
<dt>Author</dt> <dd>markoheijnen</dd>
<dt>Date</dt> <dd>2014-05-19 14:39:04 +0000 (Mon, 19 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Import "fuzzy" flag. Props nacin.
Also includes one basic test.
Fixes <a href="http://glotpress.trac.wordpress.org/ticket/138">#138</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_translation_setphp">trunk/t/tests/tests_things/test_thing_translation_set.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 (920 => 921)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-includes/things/translation-set.php 2014-05-19 12:36:21 UTC (rev 920)
+++ trunk/gp-includes/things/translation-set.php 2014-05-19 14:39:04 UTC (rev 921)
</span><span class="lines">@@ -47,8 +47,9 @@
</span><span class="cx"> unset( $current_translations_list );
</span><span class="cx"> $translations_added = 0;
</span><span class="cx"> foreach( $translations->entries as $entry ) {
</span><del>- if ( empty( $entry->translations ) ) continue;
- if ( in_array( 'fuzzy', $entry->flags ) ) continue;
</del><ins>+ if ( empty( $entry->translations ) ) {
+ continue;
+ }
</ins><span class="cx">
</span><span class="cx"> $create = false;
</span><span class="cx"> if ( $translated = $current_translations->translate_entry( $entry ) ) {
</span><span class="lines">@@ -70,10 +71,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $entry->translation_set_id = $this->id;
</span><del>- $entry->status = 'current';
</del><ins>+ $entry->status = in_array( 'fuzzy', $entry->flags ) ? 'fuzzy' : 'current';
</ins><span class="cx"> // check for errors
</span><span class="cx"> $translation = GP::$translation->create( $entry );
</span><del>- $translation->set_status( 'current' );
</del><ins>+ $translation->set_status( $entry->status );
</ins><span class="cx"> $translations_added += 1;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunktteststests_thingstest_thing_translation_setphp"></a>
<div class="modfile"><h4>Modified: trunk/t/tests/tests_things/test_thing_translation_set.php (920 => 921)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/t/tests/tests_things/test_thing_translation_set.php 2014-05-19 12:36:21 UTC (rev 920)
+++ trunk/t/tests/tests_things/test_thing_translation_set.php 2014-05-19 14:39:04 UTC (rev 921)
</span><span class="lines">@@ -8,6 +8,7 @@
</span><span class="cx"> $translation = $this->factory->translation->create( array( 'translation_set_id' => $source_set->id ) );
</span><span class="cx"> $destination_set->copy_translations_from( $source_set->id );
</span><span class="cx"> $destination_set_translations = GP::$translation->find( array( 'translation_set_id' => $destination_set->id ) );
</span><ins>+
</ins><span class="cx"> $this->assertEquals( 1, count( $destination_set_translations ) );
</span><span class="cx"> $this->assertEqualFields( $destination_set_translations[0],
</span><span class="cx"> array( 'translation_0' => $translation->translation_0, 'translation_set_id' => $destination_set->id, 'original_id' => $translation->original_id )
</span><span class="lines">@@ -15,7 +16,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function test_import_should_save_user_info() {
</span><del>-
</del><span class="cx"> global $wp_auth_object;
</span><span class="cx">
</span><span class="cx"> $user = $this->factory->user->create( array( 'user_login' => 'pijo' ) );
</span><span class="lines">@@ -30,7 +30,23 @@
</span><span class="cx">
</span><span class="cx"> $translations = GP::$translation->all();
</span><span class="cx"> $this->assertEquals( $translations[0]->user_id, $user->id );
</span><ins>+ }
</ins><span class="cx">
</span><ins>+ function test_import_should_save_fuzzy() {
+ $set = $this->factory->translation_set->create_with_project_and_locale();
+ $original = $this->factory->original->create( array( 'project_id' => $set->project->id, 'status' => '+active', 'singular' => 'A string' ) );
+ $original = $this->factory->original->create( array( 'project_id' => $set->project->id, 'status' => '+active', 'singular' => 'Second string' ) );
+
+ $translations_for_import = new Translations;
+ $translations_for_import->add_entry( array( 'singular' => 'A string', 'translations' => array( 'baba' ), 'flags' => array('fuzzy' ) ) );
+ $translations_for_import->add_entry( array( 'singular' => 'Second string', 'translations' => array( 'second' ) ) );
+ $set->import( $translations_for_import );
+
+ $translations = GP::$translation->all();
+
+ $this->assertEquals( $translations[0]->status, 'fuzzy' );
+ $this->assertEquals( $translations[1]->status, 'current' );
</ins><span class="cx"> }
</span><ins>+
</ins><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>