<!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>[10063] sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/inc/cli/class-make-core-pot.php: Translate: Adjust make-core-pot command to merge references and comments of duplicate originals before removing the duplicates.</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/10063">10063</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/10063","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>2020-07-11 15:57:12 +0000 (Sat, 11 Jul 2020)</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: Adjust make-core-pot command to merge references and comments of duplicate originals before removing the duplicates.
Also, fix duplicate file comments in POT files and improve exclude lists.
See <a href="http://meta.trac.wordpress.org/ticket/5314">#5314</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggpcustomizationsinccliclassmakecorepotphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/inc/cli/class-make-core-pot.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggpcustomizationsinccliclassmakecorepotphp"></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-make-core-pot.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-make-core-pot.php 2020-07-11 03:33:41 UTC (rev 10062)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/inc/cli/class-make-core-pot.php 2020-07-11 15:57:12 UTC (rev 10063)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2,10 +2,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> namespace WordPressdotorg\GlotPress\Customizations\CLI;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+use Gettext\Extractors\Po;
+use Gettext\Translations;
</ins><span class="cx" style="display: block; padding: 0 10px"> use GP;
</span><span class="cx" style="display: block; padding: 0 10px"> use WP_CLI;
</span><span class="cx" style="display: block; padding: 0 10px"> use WP_CLI\Utils;
</span><span class="cx" style="display: block; padding: 0 10px"> use WP_CLI_Command;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+use WP_CLI\I18n\PotGenerator;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> class Make_Core_Pot extends WP_CLI_Command {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -56,9 +59,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ], JSON_UNESCAPED_SLASHES );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $file_comment = sprintf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'Copyright (C) %s by the contributors\nThis file is distributed under the same license as the WordPress package.',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "Copyright (C) %s by the contributors\nThis file is distributed under the same license as the WordPress package.",
</ins><span class="cx" style="display: block; padding: 0 10px"> date( 'Y' )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ PotGenerator::setCommentBeforeHeaders( $file_comment );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $command_args = [
</span><span class="cx" style="display: block; padding: 0 10px"> 'i18n',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -71,7 +75,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'include' => 'wp-admin/includes/continents-cities.php',
</span><span class="cx" style="display: block; padding: 0 10px"> 'package-name' => self::PACKAGE_NAME,
</span><span class="cx" style="display: block; padding: 0 10px"> 'headers' => $headers,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'file-comment' => $file_comment,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'file-comment' => '',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'skip-js' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'skip-audit' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'ignore-domain' => true,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -107,6 +111,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-includes/rss.php',
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-includes/js/codemirror/*',
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-includes/js/crop/*',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wp-includes/js/dist/vendor/*',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'wp-includes/js/imgareaselect/*',
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-includes/js/jcrop/*',
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-includes/js/jquery/*',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -114,7 +119,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-includes/js/plupload/*',
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-includes/js/swfupload/*',
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-includes/js/thickbox/*',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wp-includes/js/clipboard.js',
+ 'wp-includes/js/colorpicker.js',
+ 'wp-includes/js/hoverIntent.js',
+ 'wp-includes/js/json2.js',
+ 'wp-includes/js/swfobject.js',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'wp-includes/js/tw-sack.js',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wp-includes/js/twemoji.js',
+ 'wp-includes/js/underscore.js',
</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"> // Support https://build.trac.wordpress.org/browser/branches/4.2/wp-includes/js/tinymce/wp-mce-help.php for pre-4.3.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -133,7 +145,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'exclude' => implode( ',', $front_end_exclude ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'package-name' => self::PACKAGE_NAME,
</span><span class="cx" style="display: block; padding: 0 10px"> 'headers' => $headers,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'file-comment' => $file_comment,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'file-comment' => '',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'skip-audit' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'ignore-domain' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> ];
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -159,7 +171,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'include' => 'hello.php',
</span><span class="cx" style="display: block; padding: 0 10px"> 'package-name' => self::PACKAGE_NAME,
</span><span class="cx" style="display: block; padding: 0 10px"> 'headers' => $headers,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'file-comment' => $file_comment,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'file-comment' => '',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'skip-js' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'skip-audit' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'ignore-domain' => true,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -183,12 +195,16 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $admin_exclude = [
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-admin/includes/continents-cities.php',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'editor.min.js', // Explicitly excluded as it's causing a memory leak: https://github.com/wp-cli/i18n-command/issues/185
</del><span class="cx" style="display: block; padding: 0 10px"> // External libraries.
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-admin/includes/class-ftp*',
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-admin/includes/class-pclzip.php',
</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">+ // Explicitly exclude minified JavaScript files as they may
+ // cause memory leaks: https://github.com/wp-cli/i18n-command/issues/185.
+ $admin_min_js = array_map( 'basename', glob( $this->source . '/wp-admin/js/*.min.js' ) );
+ $admin_exclude = array_merge( $admin_exclude, $admin_min_js );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $admin_exclude = array_merge( $admin_exclude, $admin_network_files );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $command_args = [
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -202,10 +218,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'exclude' => implode( ',', $admin_exclude ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'include' => 'wp-admin/*',
</span><span class="cx" style="display: block; padding: 0 10px"> 'merge' => $hello_dolly_pot,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'subtract' => $this->destination . '/wordpress.pot',
</del><span class="cx" style="display: block; padding: 0 10px"> 'package-name' => self::PACKAGE_NAME,
</span><span class="cx" style="display: block; padding: 0 10px"> 'headers' => $headers,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'file-comment' => $file_comment,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'file-comment' => '',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'skip-audit' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'ignore-domain' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> ];
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -218,6 +233,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> unlink( $hello_dolly_pot );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->merge_pot( $this->destination . '/wordpress.pot', $this->destination . '/wordpress-admin.pot' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Admin Network.
</span><span class="cx" style="display: block; padding: 0 10px"> $command_args = [
</span><span class="cx" style="display: block; padding: 0 10px"> 'i18n',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -228,10 +245,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $command_assoc_args = [
</span><span class="cx" style="display: block; padding: 0 10px"> 'include' => implode( ',', $admin_network_files ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'subtract' => sprintf( '%1$s/wordpress.pot,%1$s/wordpress-admin.pot', $this->destination ),
</del><span class="cx" style="display: block; padding: 0 10px"> 'package-name' => self::PACKAGE_NAME,
</span><span class="cx" style="display: block; padding: 0 10px"> 'headers' => $headers,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'file-comment' => $file_comment,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'file-comment' => '',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'skip-js' => true, // TODO: No use of wp.i18n, yet.
</span><span class="cx" style="display: block; padding: 0 10px"> 'skip-audit' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'ignore-domain' => true,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -238,6 +254,9 @@
</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"> WP_CLI::run_command( $command_args, $command_assoc_args );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $this->merge_pot( $this->destination . '/wordpress.pot', $this->destination . '/wordpress-admin-network.pot' );
+ $this->merge_pot( $this->destination . '/wordpress-admin.pot', $this->destination . '/wordpress-admin-network.pot' );
</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">@@ -253,4 +272,38 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return preg_match( '/\$wp_version\s*=\s*\'(.*?)\';/', file_get_contents( $version_php ), $matches ) ? $matches[1] : false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * Merges duplicate originals of two POT files.
+ *
+ * Preserves the references and comments of each original.
+ *
+ * @param string $to_file Path to the POT file where duplicates should be merged into.
+ * @param string $from_file Path to the POT file where duplicates should be extracted from.
+ */
+ private function merge_pot( $to_file, $from_file ) {
+ $to = new Translations();
+ Po::fromFile( $to_file, $to );
+ $from = new Translations();
+ Po::fromFile( $from_file, $from );
+
+ foreach ( $to as $original ) {
+ // Check for duplicate.
+ $existing = $from->find( $original );
+ if ( ! $existing ) {
+ continue;
+ }
+
+ // Merge.
+ $original->mergeWith( $existing );
+
+ // Remove original from source
+ unset( $from[ $existing->getId() ] );
+ }
+
+ $to->deleteHeader( Translations::HEADER_LANGUAGE );
+ $from->deleteHeader( Translations::HEADER_LANGUAGE );
+ PotGenerator::toFile( $to, $to_file );
+ PotGenerator::toFile( $from, $from_file );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>