<!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>[12827] sites/trunk: API: Translations: Cache the specific locales a plugin/theme is translated into separate from the actual translations of the item.</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/12827">12827</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/12827","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dd32</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2023-08-10 03:35:32 +0000 (Thu, 10 Aug 2023)</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'>API: Translations: Cache the specific locales a plugin/theme is translated into separate from the actual translations of the item.
This allows us to cache the specific data in PHP APCu cache and significantly reduce the number of objects that need to be queried.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkapiwordpressorgpublic_htmltranslationslibphp">sites/trunk/api.wordpress.org/public_html/translations/lib.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggpcustomizationsinccliclasslanguagepackphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/inc/cli/class-language-pack.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkapiwordpressorgpublic_htmltranslationslibphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/api.wordpress.org/public_html/translations/lib.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/api.wordpress.org/public_html/translations/lib.php 2023-08-09 21:00:33 UTC (rev 12826)
+++ sites/trunk/api.wordpress.org/public_html/translations/lib.php 2023-08-10 03:35:32 UTC (rev 12827)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -145,13 +145,23 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_cache_add_global_groups( $translations_cache_group );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Filter the requested languages down to only valid translated locales.
+ $translated_languages = find_translated_locales_for( $type, $domain );
+ $languages = array_filter( $languages, function( $language ) use( $translated_languages ) {
+ return (
+ // Skip any invalid language data requested
+ is_string( $language ) &&
+ // and only query for languages this item is translated into
+ in_array( strtolower( $language ), $translated_languages, true )
+ );
+ } );
+
+ if ( ! $languages ) {
+ return array();
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $return = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $languages as $language ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Skip if an invalid language was provided to the API.
- if ( ! is_string( $language ) ) {
- continue;
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> // Disable LP's for en_US for now, can re-enable later if we have non-en_US native items
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'en_US' == $language ) {
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -286,3 +296,48 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $translations;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+/**
+ * Find the languages an item is actually translated into.
+ *
+ * Used by find_latest_translations().
+ *
+ * @param string $type Type of item. Expects 'core', 'plugin', or 'theme'.
+ * @param string $domain Item slug.
+ * @return array Array of lower-case language codes.
+ */
+function find_translated_locales_for( $type, $domain ) {
+ global $wpdb;
+
+ $cache_group = 'translations-query';
+ $cache_key = "{$type}:{$domain}";
+ $cache_time = 86400; // 24hrs
+ $apcu_cache_time = 60;
+
+ wp_cache_add_global_groups( $cache_group );
+
+ $languages = apcu_fetch( "{$cache_group}:{$cache_key}", $found );
+ if ( ! $found ) {
+ $languages = wp_cache_get( $cache_key, $cache_group, false, $found );
+ if ( $found ) {
+ apcu_store( "{$cache_group}:{$cache_key}", $translated_languages, $apcu_cache_time );
+ }
+ }
+
+ if ( ! $found ) {
+ $languages = $wpdb->get_col( $wpdb->prepare(
+ "SELECT DISTINCT `language`
+ FROM `language_packs`
+ WHERE `type` = %s AND `domain` = %s AND `active` = 1",
+ $type,
+ $domain
+ ) );
+
+ $languages = array_map( 'strtolower', $languages );
+
+ apcu_store( "{$cache_group}:{$cache_key}", $languages, $apcu_cache_time );
+ wp_cache_add( $cache_key, $translated_languages, $cache_group, $cache_time );
+ }
+
+ return $languages ?: array();
+}
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggpcustomizationsinccliclasslanguagepackphp"></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/inc/cli/class-language-pack.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/inc/cli/class-language-pack.php 2023-08-09 21:00:33 UTC (rev 12826)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/inc/cli/class-language-pack.php 2023-08-10 03:35:32 UTC (rev 12827)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -583,6 +583,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_cache_add_global_groups( [ 'update-check-translations', 'translations-query' ] );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_cache_delete( "{$type}:{$language}:{$domain}", 'update-check-translations' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_cache_delete( "{$type}:{$domain}:{$version}", 'translations-query' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_cache_delete( "{$type}:{$domain}", 'translations-query' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>