<!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>[8558] sites/trunk/wordpress.org/public_html/wp-content/plugins: Translate: Query variants of a locale in a more performant way.</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 { white-space: pre-line; 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/8558">8558</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/8558","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>2019-03-30 10:12:10 +0000 (Sat, 30 Mar 2019)</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: Query variants of a locale in a more performant way.
Instead of querying for a specific list of projects, use the main WordPress core project (`wp/dev`) which is the canonical source for all available and active locales.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggpcustomizationstemplateslocaleprojectphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/templates/locale-project.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggproutesincroutesclasslocalephp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/inc/routes/class-locale.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggpcustomizationstemplateslocaleprojectphp"></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-customizations/templates/locale-project.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-customizations/templates/locale-project.php 2019-03-30 09:44:40 UTC (rev 8557)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/templates/locale-project.php 2019-03-30 10:12:10 UTC (rev 8558)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -116,7 +116,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $stable_project_slug = in_array( 'stable', $sub_project_slugs, true ) ? 'stable' : 'dev';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $stable_project_name = 'stable' === $stable_project_slug ? 'Stable (latest release) ' : 'Development (trunk) ';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $stable_project_name = 'stable' === $stable_project_slug ? 'Stable (latest release)' : 'Development (trunk)';
</ins><span class="cx" style="display: block; padding: 0 10px"> $status = $sub_project_statuses[ $stable_project_slug ];
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="wporg-notice wporg-notice-info">
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggproutesincroutesclasslocalephp"></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-locale.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-locale.php 2019-03-30 09:44:40 UTC (rev 8557)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/inc/routes/class-locale.php 2019-03-30 10:12:10 UTC (rev 8558)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -133,7 +133,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $contributors_count = array();
</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">- $variants = $this->get_locale_variants( $locale_slug, $project_ids );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $variants = $this->get_locale_variants( $locale_slug );
</ins><span class="cx" style="display: block; padding: 0 10px"> // If there were no results for the current variant in the current project branch, it should still show it.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! in_array( $set_slug, $variants, true ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $variants[] = $set_slug;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -187,26 +187,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $contributors_count = array();
</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">- $sub_projects = $this->get_active_sub_projects( $sub_project, true );
- $sub_project_slugs = array();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $sub_project_statuses = array();
+ $sub_projects = $this->get_active_sub_projects( $sub_project, true );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $sub_projects ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $sub_project_ids = array();
- $sub_project_statuses = array();
</del><span class="cx" style="display: block; padding: 0 10px"> foreach ( $sub_projects as $key => $_sub_project ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $sub_project_slugs[] = $_sub_project->slug;
- $status = $this->get_project_status( $_sub_project, $locale_slug, $set_slug, null, false );
-
- $sub_project_ids[] = $_sub_project->id;
-
- $sub_project_statuses[ $_sub_project->slug ] = $status;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $sub_project_statuses[ $_sub_project->slug ] = $this->get_project_status(
+ $_sub_project,
+ $locale_slug,
+ $set_slug,
+ null,
+ false
+ );
</ins><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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $variants = $this->get_locale_variants( $locale_slug, $sub_project_ids );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $sub_project_slugs = array_keys( $sub_project_statuses );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- unset( $sub_project_ids );
- } else {
- $variants = $this->get_locale_variants( $locale_slug, array( $sub_project->id ) );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $variants = $this->get_locale_variants( $locale_slug );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $locale_contributors = $this->get_locale_contributors( $sub_project, $locale_slug, $set_slug );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -220,57 +217,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Whether a translation set slug exists for a locale.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * For performance reasons, this checks the wp/dev project which is the canonical
+ * source for all available and active locales.
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param \GP_Locale $locale The locale.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $slug The slug of a translation set.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool True if slug exists, false if not.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> private function translation_set_slug_exists( $locale, $slug ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /*$cache_key = "translation_set_slugs:{$locale->slug}";
- $slugs = wp_cache_get( $cache_key, $this->cache_group );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $wpdb;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false === $slugs ) {
- global $wpdb;
- $slugs = $wpdb->get_col( $wpdb->prepare(
- "SELECT DISTINCT(slug) FROM {$wpdb->gp_translation_sets} WHERE locale = %s",
- $locale->slug
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = $wpdb->get_var( $wpdb->prepare(
+ "SELECT id FROM {$wpdb->gp_translation_sets} WHERE locale = %s AND slug = %s AND project_id = %d",
+ $locale->slug,
+ $slug,
+ 2 // wp/dev
+ ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_cache_set( $cache_key, $slugs, $this->cache_group, DAY_IN_SECONDS );
- }*/
-
- // Hardcoded list because the query above doesn't perform well due to a missing index.
- $slugs = [
- 'default' => [
- 'default',
- ],
- 'ca' => [
- 'default',
- 'valencia',
- ],
- 'de' => [
- 'default',
- 'formal',
- ],
- 'de-ch' => [
- 'default',
- 'informal',
- ],
- 'nl' => [
- 'default',
- 'formal',
- ],
- 'pt' => [
- 'default',
- 'informal',
- 'ao90',
- ],
- ];
-
- if ( isset( $slugs[ $locale->slug ] ) ) {
- return in_array( $slug, $slugs[ $locale->slug ], true );
- }
-
- return in_array( $slug, $slugs['default'], true );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return null !== $id;
</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">@@ -345,26 +309,22 @@
</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">- * Retrieves non-default slugs of translation sets for a list of
- * project IDs.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Retrieves all slugs of translation sets for a locale.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $locale Slug of a GlotPress locale.
- * @param array $project_ids List of project IDs.
- * @return array List of non-default slugs.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * For performance reasons, this checks the wp/dev project which is the canonical
+ * source for all available and active locales.
+ *
+ * @param string $locale Slug of a GlotPress locale.
+ * @return array List of translation set slugs.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- private function get_locale_variants( $locale, $project_ids ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ private function get_locale_variants( $locale ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $project_ids = implode( ',', $project_ids );
- $slugs = $wpdb->get_col( $wpdb->prepare( "
- SELECT DISTINCT slug
- FROM {$wpdb->gp_translation_sets}
- WHERE
- project_id IN( $project_ids )
- AND locale = %s
- ", $locale ) );
-
- return $slugs;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return $wpdb->get_col( $wpdb->prepare(
+ "SELECT slug FROM {$wpdb->gp_translation_sets} WHERE locale = %s AND project_id = %d",
+ $locale,
+ 2 // wp/dev
+ ) );
</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></pre>
</div>
</div>
</body>
</html>