<!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>[4419] sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-directory.php: Plugin directory: replace on-the-fly virtual postmeta translations with a function to store translated content in real postmeta.</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/4419">4419</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/4419","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>tellyworth</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-11-25 05:44:18 +0000 (Fri, 25 Nov 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'>Plugin directory: replace on-the-fly virtual postmeta translations with a function to store translated content in real postmeta.
The old method no longer works with Jetpack sync; this should. The function is not yet called, that should be done async, or triggered by translation updates.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryclassplugindirectoryphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-directory.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryclassplugindirectoryphp"></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/plugin-directory/class-plugin-directory.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/plugin-directory/class-plugin-directory.php 2016-11-24 22:04:35 UTC (rev 4418)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-directory.php 2016-11-25 05:44:18 UTC (rev 4419)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,15 +11,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> class Plugin_Directory {
</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">- * Local cache for translated content injected into meta.
- *
- * @access private
- *
- * @var array
- */
- private $i18n_meta = array();
-
- /**
</del><span class="cx" style="display: block; padding: 0 10px"> * Fetch the instance of the Plugin_Directory class.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @static
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -333,12 +324,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> \Jetpack_Search::instance();
</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">- // When Jetpack syncs, we want to add filters to inject additional metadata for Jetpack, so it syncs for ElasticSearch indexing.
- if ( defined( 'DOING_CRON' ) )
- $this->append_meta_for_jetpack();
- else
- add_action( 'shutdown', array( $this, 'append_meta_for_jetpack' ), 8 );
-
</del><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">@@ -499,9 +484,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function filter_rel_nofollow( $content ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( get_post_type() == 'plugin' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( get_post_type() == 'plugin' ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // regex copied from wp_rel_nofollow(). Not calling that function because it messes with slashes.
</span><span class="cx" style="display: block; padding: 0 10px"> $content = preg_replace_callback('|<a (.+?)>|i', 'wp_rel_nofollow_callback', $content);
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> return $content;
</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">@@ -707,89 +693,79 @@
</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">- * Shutdown action that will add a filter to inject additional postmeta containing translated content if Jetpack
- * is syncing.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Fetch all translated content for a given post, and push it into postmeta.
+ *
+ * @global string $locale Current locale.
+ *
+ * @param int $post_id Post ID to update.
+ * @param int $min_translated Translations below this % threshold will not be synced to meta, to save space.
+ * @return array
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function append_meta_for_jetpack() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function sync_all_translations_to_meta( $post_id, $min_translated = 60, $skip_pfx = array('en_') ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /*
- * Guess if a Jetpack sync is scheduled to run. It runs during shutdown at a lower priority than this action,
- * so we can get in first.Fetching the extra meta to inject is expensive, so we only want to do this if a sync
- * is likely.
- * As of Jetpack 4.4, sync can also run in a cron job, so filter the meta there too.
- */
- if ( class_exists( 'Jetpack' ) && ( defined( 'DOING_CRON' ) || ! empty( \Jetpack::$instance->sync->sync ) ) ) {
- // Attempt to work around the problem with options cache poisoning from subdomains
- refresh_blog_details();
- add_filter( 'wporg_plugins_custom_meta_fields', array( $this, 'filter_post_meta_i18n' ), 10, 2 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $locales_to_sync = array();
+ $post = get_post( $post_id );
+ if ( $post ) {
+ $translations = Plugin_I18n::find_all_translations_for_plugin( $post->post_name, 'stable-readme', $min_translated ); // at least $min_translated % translated
+ if ( $translations ) {
+ // Eliminate translations that start with unwanted prefixes, so we don't waste space on near-duplicates like en_AU, en_CA etc.
+ foreach ( $translations as $i => $_locale ) {
+ foreach ( $skip_pfx as $pfx )
+ if ( substr( $_locale, 0, strlen( $pfx ) ) === $pfx )
+ unset( $translations[ $i ] );
+ }
+ $locales_to_sync = $translations;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( count($locales_to_sync) > 0 ) {
+ foreach ( $locales_to_sync as $locale ) {
+ $this->sync_translation_to_meta( $post_id, $locale );
+ }
+ }
+
+ return $locales_to_sync;
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Filter for wporg_plugins_custom_meta_fields to inject translated content for ES.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Fetch translated content for a given post and locale, and push it into postmeta.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @global string $locale Current locale.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param array $meta
- * @param int $post_id
- * @return array
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param int $post_id Post ID to update.
+ * @param string $locale Locale to translate.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function filter_post_meta_i18n( $meta, $post_id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function sync_translation_to_meta( $post_id, $_locale ) {
+ global $locale;
+ $old_locale = $locale;
+ $locale = $_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">- // Prevent recursion and repeat runs.
- remove_filter( 'wporg_plugins_custom_meta_fields', array( $this, 'filter_post_meta_i18n' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Update postmeta values for the translated title, excerpt, and content, if they are available and different from the originals.
+ // There is a bug here, in that no attempt is made to remove old meta values for translations that do not have new translations.
</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 ( empty( $this->i18n_meta[ $post_id ] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $the_title = Plugin_I18n::instance()->translate( 'title', get_the_title( $post_id ), [ 'post_id' => $post_id ] );
+ if ( $the_title && $the_title != get_the_title( $post_id ) ) {
+ update_post_meta( $post_id, 'title_' . $locale, $the_title );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $locales_to_sync = array(
- // Default locales to translate, just in case we can't determine the available ones
- 'fr_FR',
- 'es_ES',
- );
- $post = get_post( $post_id );
- if ( $post ) {
- $translations = Plugin_I18n::find_all_translations_for_plugin( $post->post_name, 'stable-readme', 10 ); // at least 10% translated
- if ( $translations )
- $locales_to_sync = $translations;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $the_excerpt = $this->translate_post_excerpt( get_the_excerpt( $post_id ), $post_id );
+ if ( $the_excerpt && $the_excerpt != get_the_excerpt( $post_id ) ) {
+ update_post_meta( $post_id, 'excerpt_' . $locale, $the_excerpt );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $locale;
- $_locale = $locale;
-
- foreach ( $locales_to_sync as $locale ) {
- $the_title = Plugin_I18n::instance()->translate( 'title', get_the_title( $post_id ), [ 'post_id' => $post_id ] );
- if ( $the_title && $the_title != get_the_title( $post_id ) ) {
- $this->i18n_meta[ $post_id ][ 'title_' . $locale ] = $the_title;
- }
-
- $the_excerpt = $this->translate_post_excerpt( get_the_excerpt( $post_id ), $post_id );
- if ( $the_excerpt && $the_excerpt != get_the_excerpt( $post_id ) ) {
- $this->i18n_meta[ $post_id ][ 'excerpt_' . $locale ] = $the_excerpt;
- }
-
- // Split up the content to translate it in sections.
- $the_content = array();
- $sections = $this->split_post_content_into_pages( get_the_content( $post_id ) );
- foreach ( $sections as $section => $section_content ) {
- $translated_section = $this->translate_post_content( $section_content, $section, $post_id );
- if ( $translated_section && $translated_section != $section_content ) {
- $the_content[] = $translated_section;
- }
- }
- if ( !empty( $the_content ) )
- $this->i18n_meta[ $post_id ][ 'content_' . $locale ] = implode( $the_content );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Split up the content to translate it in sections.
+ $the_content = array();
+ $sections = $this->split_post_content_into_pages( get_the_content( $post_id ) );
+ foreach ( $sections as $section => $section_content ) {
+ $translated_section = $this->translate_post_content( $section_content, $section, $post_id );
+ if ( $translated_section && $translated_section != $section_content ) {
+ $the_content[] = $translated_section;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- $locale = $_locale;
-
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( !empty( $the_content ) )
+ update_post_meta( $post_id, 'content_' . $locale, implode( $the_content ) );
</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 ( is_array( $this->i18n_meta[ $post_id ] ) )
- $meta = array_merge( $meta, array_keys( $this->i18n_meta[ $post_id ] ) );
-
- add_filter( 'wporg_plugins_custom_meta_fields', array( $this, 'filter_post_meta_i18n' ), 10, 2 );
-
- return $meta;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $locale = $old_locale;
</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>