<!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>[3013] sites/trunk: Translate, Consistency: Remove fuzzy search because the query times out.</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="http://meta.trac.wordpress.org/changeset/3013">3013</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/3013","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-04-26 14:23:48 +0000 (Tue, 26 Apr 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'>Translate, Consistency: Remove fuzzy search because the query times out.
See <a href="http://meta.trac.wordpress.org/ticket/1682">#1682</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunktranslatewordpressorgpublic_htmlgptemplatesnewconsistencyphp">sites/trunk/translate.wordpress.org/public_html/gp-templates-new/consistency.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggproutesincroutesclassconsistencyphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/inc/routes/class-consistency.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunktranslatewordpressorgpublic_htmlgptemplatesnewconsistencyphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/translate.wordpress.org/public_html/gp-templates-new/consistency.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/translate.wordpress.org/public_html/gp-templates-new/consistency.php 2016-04-26 08:19:09 UTC (rev 3012)
+++ sites/trunk/translate.wordpress.org/public_html/gp-templates-new/consistency.php 2016-04-26 14:23:48 UTC (rev 3013)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -27,10 +27,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="checkbox" name="search_case_sensitive" value="1"<?php checked( $search_case_sensitive ); ?>>
</span><span class="cx" style="display: block; padding: 0 10px"> Case Sensitive
</span><span class="cx" style="display: block; padding: 0 10px"> </label>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <label>
- <input type="checkbox" name="search_fuzzy" value="1"<?php checked( $search_fuzzy ); ?>>
- Fuzzy Search (<em>term*</em>)
- </label>
</del><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> </form>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -40,23 +36,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<p class="notice">No results were found.</p>';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $performed_search && $results ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $search_fuzzy && $translations_unique ) {
- $translations_unique_count = count( $translations_unique );
- if ( 1 === $translations_unique_count ) {
- echo '<p class="notice">All originals have the same translations</p>';
- } else {
- echo '<div class="notice wporg-notice-warning"><p>There are ' . $translations_unique_count . ' different translations. <a id="toggle-translations-unique" href="#show">View</a></p>';
- echo '<ul class="translations-unique hidden">';
- foreach ( $translations_unique as $translation ) {
- printf(
- '<li data-id="%s">%s</li>',
- md5( $translation ),
- str_replace( ' ', '<span class="space"> </span>', esc_translation( $translation ) )
- );
- }
- echo '</ul>';
- echo '</div>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $translations_unique_count = count( $translations_unique );
+ if ( 1 === $translations_unique_count ) {
+ echo '<p class="notice">All originals have the same translations</p>';
+ } else {
+ echo '<div class="notice wporg-notice-warning"><p>There are ' . $translations_unique_count . ' different translations. <a id="toggle-translations-unique" href="#show">View</a></p>';
+ echo '<ul class="translations-unique hidden">';
+ foreach ( $translations_unique as $translation ) {
+ printf(
+ '<li data-id="%s">%s</li>',
+ md5( $translation ),
+ str_replace( ' ', '<span class="space"> </span>', esc_translation( $translation ) )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo '</ul>';
+ echo '</div>';
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -84,28 +78,15 @@
</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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $search_link = '';
- if ( $search_fuzzy ) {
- $search_link = sprintf(
- ' | <a href="%s">Search</a>',
- esc_url( add_query_arg( [
- 'search' => urlencode( $result->original_singular ),
- 'search_fuzzy' => 0,
- 'search_case_senstive' => 1,
- ] ) )
- );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><span class="cx" style="display: block; padding: 0 10px"> '<tr><td>%s</td><td>%s</td></tr>',
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> '<div class="string">%s%s</div>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div class="meta">Project: <a href="/projects/%s">%s</a>%s</div>',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="meta">Project: <a href="/projects/%s">%s</a></div>',
</ins><span class="cx" style="display: block; padding: 0 10px"> esc_translation( $result->original_singular ),
</span><span class="cx" style="display: block; padding: 0 10px"> $original_context,
</span><span class="cx" style="display: block; padding: 0 10px"> $result->project_path,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $project_name,
- $search_link
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $project_name
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> '<div class="string%s">%s</div>
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggproutesincroutesclassconsistencyphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/inc/routes/class-consistency.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/inc/routes/class-consistency.php 2016-04-26 08:19:09 UTC (rev 3012)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/inc/routes/class-consistency.php 2016-04-26 14:23:48 UTC (rev 3013)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -21,7 +21,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $sets = $this->get_translation_sets();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $search = $set = '';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $search_fuzzy = false;
</del><span class="cx" style="display: block; padding: 0 10px"> $search_case_sensitive = true;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $_REQUEST['search'] ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -39,10 +38,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $search_case_sensitive = false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! empty( $_REQUEST['search_fuzzy'] ) ) {
- $search_fuzzy = true;
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> $locale_is_rtl = false;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $set ) {
</span><span class="cx" style="display: block; padding: 0 10px"> list( $locale, $slug ) = explode( '/', $set );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -56,7 +51,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $results = $this->query( [
</span><span class="cx" style="display: block; padding: 0 10px"> 'search' => $search,
</span><span class="cx" style="display: block; padding: 0 10px"> 'set' => $set,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'fuzzy' => $search_fuzzy,
</del><span class="cx" style="display: block; padding: 0 10px"> 'case_sensitive' => $search_case_sensitive,
</span><span class="cx" style="display: block; padding: 0 10px"> ] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -109,11 +103,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $collation = '';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $args['fuzzy'] ) {
- $search = $wpdb->prepare( "LIKE {$collation} %s", $wpdb->esc_like( $args['search'] ) . '%%' );
- } else {
- $search = $wpdb->prepare( "= {$collation} %s", $args['search'] );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $search = $wpdb->prepare( "= {$collation} %s", $args['search'] );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $locale = $wpdb->prepare( '%s', $locale );
</span><span class="cx" style="display: block; padding: 0 10px"> $slug = $wpdb->prepare( '%s', $slug );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -132,15 +122,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> t.date_added AS translation_added,
</span><span class="cx" style="display: block; padding: 0 10px"> t.id AS translation_id
</span><span class="cx" style="display: block; padding: 0 10px"> FROM {$wpdb->gp_originals} AS o
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- JOIN
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ JOIN
</ins><span class="cx" style="display: block; padding: 0 10px"> {$wpdb->gp_projects} AS p ON p.id = o.project_id
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- JOIN
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ JOIN
</ins><span class="cx" style="display: block; padding: 0 10px"> {$wpdb->gp_translations} AS t ON o.id = t.original_id
</span><span class="cx" style="display: block; padding: 0 10px"> JOIN
</span><span class="cx" style="display: block; padding: 0 10px"> {$wpdb->gp_translation_sets} as ts on ts.id = t.translation_set_id
</span><span class="cx" style="display: block; padding: 0 10px"> WHERE
</span><span class="cx" style="display: block; padding: 0 10px"> p.active = 1
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- AND t.status = 'current'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ AND t.status = 'current'
</ins><span class="cx" style="display: block; padding: 0 10px"> AND o.status = '+active' AND o.singular {$search}
</span><span class="cx" style="display: block; padding: 0 10px"> AND ts.locale = {$locale} AND ts.slug = {$slug}
</span><span class="cx" style="display: block; padding: 0 10px"> LIMIT 0, 500
</span></span></pre>
</div>
</div>
</body>
</html>