<!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>[7895] sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-theme-directory/inc/cli/class-set-theme-project.php: Translate, Theme Directory: Use `wp i18n make-pot` for string extraction.</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/7895">7895</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/7895","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>2018-11-24 15:13:59 +0000 (Sat, 24 Nov 2018)</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, Theme Directory: Use `wp i18n make-pot` for string extraction.
Props herregroen, ocean90.
See <a href="http://meta.trac.wordpress.org/ticket/3748">#3748</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggpthemedirectoryinccliclasssetthemeprojectphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-theme-directory/inc/cli/class-set-theme-project.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggpthemedirectoryinccliclasssetthemeprojectphp"></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-theme-directory/inc/cli/class-set-theme-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-theme-directory/inc/cli/class-set-theme-project.php 2018-11-24 14:25:29 UTC (rev 7894)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-theme-directory/inc/cli/class-set-theme-project.php 2018-11-24 15:13:59 UTC (rev 7895)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2,6 +2,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> namespace WordPressdotorg\GlotPress\Theme_Directory\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 Exception;
</ins><span class="cx" style="display: block; padding: 0 10px"> use GP;
</span><span class="cx" style="display: block; padding: 0 10px"> use MakePOT;
</span><span class="cx" style="display: block; padding: 0 10px"> use WordPressdotorg\GlotPress\Theme_Directory\Plugin;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -24,13 +25,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> private $temp_dir;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /**
- * MakePot instance.
- *
- * @var MakePot
- */
- private $makepot;
-
</del><span class="cx" style="display: block; padding: 0 10px"> public function __construct() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! file_exists( '/tmp/wporg-themes-i18n/' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> mkdir( '/tmp/wporg-themes-i18n/' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -41,13 +35,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! mkdir( $this->temp_dir ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> WP_CLI::error( "Couldn't create temporary directory." );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- $this->checkout_tools();
- if ( ! file_exists( $this->temp_dir . '/i18n-tools/makepot.php' ) ) {
- WP_CLI::error( "Couldn't find MakePot." );
- }
- require_once $this->temp_dir . '/i18n-tools/makepot.php';
- $this->makepot = new MakePot();
</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">@@ -81,7 +68,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $theme_data = $this->get_theme_data( $theme_slug, $theme_dir );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $project = $this->find_create_update_glotpress_project( $theme_slug, $theme_data );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $pot = $this->generate_pot( $theme_slug, $theme_dir );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ try {
+ $pot = $this->generate_pot( $theme_slug, $theme_dir );
+ } catch ( Exception $exception ) {
+ $this->cleanup_theme( $theme_slug );
+ WP_CLI::error( "{$theme_slug} {$theme_version} not imported: " . $exception->getMessage() );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->import_pot_to_glotpress( $pot, $project );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->cleanup_theme( $theme_slug );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -156,8 +150,26 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string The path to the .pot file.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> private function generate_pot( $theme_slug, $theme_dir ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! defined( 'WPORGTRANSLATE_WPCLI' ) ) {
+ throw new Exception( 'Missing configuration for WPORGTRANSLATE_WPCLI.' );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $pot_file = "{$this->temp_dir}/{$theme_slug}.pot";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->makepot->wp_theme( $theme_dir, $pot_file );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $cmd = sprintf(
+ '%s i18n make-pot %s %s --slug=%s --ignore-domain --skip-audit',
+ WPORGTRANSLATE_WPCLI,
+ escapeshellarg( $theme_dir ),
+ escapeshellarg( $pot_file ),
+ escapeshellarg( $theme_slug )
+ );
+
+ exec( $cmd, $output, $return_code );
+
+ if ( 0 !== $return_code || ! file_exists( $pot_file ) ) {
+ throw new Exception( "POT file couldn't be created." );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> return $pot_file;
</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">@@ -177,7 +189,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => $theme_slug,
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => $theme_data['description'] . "<br><br><a href='https://wordpress.org/themes/{$theme_slug}'>WordPress.org Theme Page</a>",
</span><span class="cx" style="display: block; padding: 0 10px"> 'parent_project_id' => $parent_project->id,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'source_url_template' => "https://themes.trac.wordpress.org/browser/$theme_slug/{$theme_data['version']}/%file%#L%line%",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'source_url_template' => "https://themes.trac.wordpress.org/browser/$theme_slug/{$theme_data['version']}/%file%?marks=%line%#L%line%",
</ins><span class="cx" style="display: block; padding: 0 10px"> 'active' => 1,
</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">@@ -289,33 +301,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function filter_import_original_priority( $data ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $priorities = array(
</span><span class="cx" style="display: block; padding: 0 10px"> // These are important strings that we need translated
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'Plugin Name of the plugin/theme' => 1,
- 'Theme Name of the plugin/theme' => 1,
- 'Description of the plugin/theme' => 1,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'Theme Name of the theme' => 1,
+ 'Description of the theme' => 1,
</ins><span class="cx" style="display: block; padding: 0 10px"> // Regular strings are more important than these:
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'Plugin URI of the plugin/theme' => -1,
- 'Theme URI of the plugin/theme' => -1,
- 'Author of the plugin/theme' => -1,
- 'Author URI of the plugin/theme' => -1,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'Theme URI of the theme' => -1,
+ 'Author of the theme' => -1,
+ 'Author URI of the theme' => -1,
</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"> if ( isset( $priorities[ $data['comment'] ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $data['priority'] = $priorities[ $data['comment'] ];
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else {
+ $data['priority'] = 0;
</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"> return $data;
</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">- * Creates an i18n-tools checkout so we have MakePot available.
- */
- private function checkout_tools() {
- $tools_dir = "{$this->temp_dir}/i18n-tools/";
- if ( ! file_exists( $tools_dir ) ) {
- $esc_tools_dir = escapeshellarg( $tools_dir );
- `svn export --non-interactive https://i18n.svn.wordpress.org/tools/trunk {$esc_tools_dir}`;
- }
- }
-
- /**
</del><span class="cx" style="display: block; padding: 0 10px"> * Cleanup a theme directory, for when this is used in batch mode.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> private function cleanup_theme( $theme_slug ) {
</span></span></pre>
</div>
</div>
</body>
</html>