<!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][1146] trunk: Originals: Don't increase the counter for updates to existing originals if there was no update.</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/1146">1146</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/1146","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-10-30 15:45:03 +0000 (Fri, 30 Oct 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'>Originals: Don't increase the counter for updates to existing originals if there was no update.
Also clear the project cache if an existing original was updated. If the original was previously obsolete and now active the project has a new string, so the counter cache needs to be cleared.
Fixes <a href="http://glotpress.trac.wordpress.org/ticket/508">#508</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkgpincludesthingsoriginalphp">trunk/gp-includes/things/original.php</a></li>
<li><a href="#trunktteststests_thingstest_thing_originalphp">trunk/t/tests/tests_things/test_thing_original.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-10-11 20:47:30 UTC (rev 1145)
+++ trunk/gp-includes/things/original.php 2015-10-30 15:45:03 UTC (rev 1146)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -108,11 +108,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Original exists, let's update it.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $originals_by_key[ $entry->key() ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $original = $originals_by_key[ $entry->key() ];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $original->status == '-obsolete' || GP::$original->is_different_from( $data, $original ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // But only if it's different, like a changed 'references', 'comment', or 'status' field.
+ if ( GP::$original->is_different_from( $data, $original ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->update( $data, array( 'id' => $original->id ) );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $originals_existing++;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- $originals_existing++;
</del><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> // We can't find this in our originals. Let's keep it for later.
</span><span class="cx" style="display: block; padding: 0 10px"> $possibly_added[] = $entry;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -175,7 +175,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"> // Clear cache when the amount of strings are changed.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $originals_added > 0 || $originals_fuzzied > 0 || $originals_obsoleted > 0 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $originals_added > 0 || $originals_existing > 0 || $originals_fuzzied > 0 || $originals_obsoleted > 0 ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_cache_delete( $project->id, self::$count_cache_group );
</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_originalphp"></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_original.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/t/tests/tests_things/test_thing_original.php 2015-10-11 20:47:30 UTC (rev 1145)
+++ trunk/t/tests/tests_things/test_thing_original.php 2015-10-30 15:45:03 UTC (rev 1146)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -105,6 +105,29 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 1, count( $fuzzy_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">+ /**
+ * @ticket 508
+ */
+ function test_import_should_clean_project_count_cache() {
+ $set = $this->factory->translation_set->create_with_project_and_locale();
+ $original = $this->factory->original->create( array( 'project_id' => $set->project->id, 'status' => '+obsolete', 'singular' => 'baba baba' ) );
+
+ $count = $original->count_by_project_id( $set->project->id );
+ $this->assertEquals( 0, $count );
+
+ $translations_for_import = $this->create_translations_with( array( array( 'singular' => 'baba baba' ) ) );
+
+ list( $originals_added, $originals_existing, $originals_fuzzied, $originals_obsoleted ) = $original->import_for_project( $set->project, $translations_for_import );
+
+ $this->assertEquals( 0, $originals_added );
+ $this->assertEquals( 1, $originals_existing );
+ $this->assertEquals( 0, $originals_fuzzied );
+ $this->assertEquals( 0, $originals_obsoleted );
+
+ $count = $original->count_by_project_id( $set->project->id );
+ $this->assertEquals( 1, $count );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> function test_import_should_remove_from_active_missing_strings() {
</span><span class="cx" style="display: block; padding: 0 10px"> $project = $this->factory->project->create();
</span><span class="cx" style="display: block; padding: 0 10px"> $original = $this->factory->original->create( array( 'project_id' => $project->id, 'status' => '+active' ) );
</span></span></pre>
</div>
</div>
</body>
</html>