<!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>[3515] sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/cli/i18n: Plugin Directory: Import translations on initial commit.</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/3515">3515</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/3515","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>2016-06-21 09:32:38 +0000 (Tue, 21 Jun 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: Import translations on initial commit.
See <a href="http://meta.trac.wordpress.org/ticket/1691">#1691</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryclii18nclasscodeimportphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/cli/i18n/class-code-import.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryclii18nclassi18nimportphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/cli/i18n/class-i18n-import.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryclii18nclassreadmeimportphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/cli/i18n/class-readme-import.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryclii18nclasscodeimportphp"></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/cli/i18n/class-code-import.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/cli/i18n/class-code-import.php 2016-06-21 08:49:44 UTC (rev 3514)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/cli/i18n/class-code-import.php 2016-06-21 09:32:38 UTC (rev 3515)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -87,11 +87,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> throw new Exception( "POT file couldn't be created." );
</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">- parent::set_glotpress_for_plugin( $this->plugin, 'code' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $result = $this->set_glotpress_for_plugin( $this->plugin, 'code' );
+ if ( is_wp_error( $result ) ) {
+ throw new Exception( $result->get_error_message() );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $branch = ( 'trunk' === $tag ) ? 'dev' : 'stable';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- parent::import_pot_to_glotpress_project( $this->plugin, $branch, $pot_file );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->import_pot_to_glotpress_project( $this->plugin, $branch, $pot_file );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // @todo: Import translations only once.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Import translations on initial import.
+ if ( 'created' === $result ) {
+ $this->import_translations_to_glotpress_project( $export_directory, $this->plugin, $branch );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryclii18nclassi18nimportphp"></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/cli/i18n/class-i18n-import.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/cli/i18n/class-i18n-import.php 2016-06-21 08:49:44 UTC (rev 3514)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/cli/i18n/class-i18n-import.php 2016-06-21 09:32:38 UTC (rev 3515)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,6 +1,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> namespace WordPressdotorg\Plugin_Directory\CLI\I18N;
</span><span class="cx" style="display: block; padding: 0 10px"> use WordPressdotorg\Plugin_Directory\Plugin_I18n;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+use WordPressdotorg\Plugin_Directory\Tools\Filesystem;
</ins><span class="cx" style="display: block; padding: 0 10px"> use WP_Error;
</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">@@ -68,14 +69,14 @@
</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">- * Import generated POT file to GlotPress
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Import generated POT file to GlotPress.
</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 $project GP project slug to import to
- * @param string $branch GP project branch to import to (dev|stable)
- * @param string $file Path to POT file
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $project GP project slug to import to
+ * @param string $branch GP project branch to import to (dev|stable)
+ * @param string $file Path to POT file
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param array $str_priorities GP string priorities
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function import_pot_to_glotpress_project( $project, $branch, $file, $str_priorities = array() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function import_pot_to_glotpress_project( $project, $branch, $file, $str_priorities = array() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Note: this will only work if the GlotPress project/sub-projects exist.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -101,4 +102,92 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * Import existing plugin translations to GlotPress.
+ * See translate/bin/translations/import-plugin-translations.php
+ *
+ * @param string $export_directory Relative path as provided by Dotorg_Plugins_Tracker.
+ * @param string $project GP project slug to import to
+ * @param string $branch GP project branch to import to (dev|stable)
+ */
+ public function import_translations_to_glotpress_project( $export_directory, $project, $branch ) {
+ $files = Filesystem::list_files( $export_directory, true, '/\.po$/' );
+
+ if ( empty( $files ) ) {
+ $files = Filesystem::list_files( $export_directory, true, '/\.mo$/' );
+ }
+
+ foreach ( $files as $file ) {
+ $filename = basename( $file );
+ if ( ! preg_match( '/(?:(.+)-)?([a-z]{2,3}(?:_[A-Z]{2})?(?:_[a-z0-9]+)?).(po|mo)$/', $filename, $match ) ) {
+ continue;
+ }
+
+ list( , , $language, $ext ) = $match;
+
+ // Fix some locales.
+ switch ( $language ) {
+ case 'ga_IR' :
+ $language = 'ga';
+ break;
+ case 'ca_ES' :
+ $language = 'ca';
+ break;
+ case 'el_GR' :
+ $language = 'el';
+ break;
+ case 'af_ZA' :
+ $language = 'af';
+ break;
+ case 'zh_cn' :
+ case 'zh_ZH' :
+ $language = 'zh_CN';
+ break;
+ case 'uk_UA' :
+ $language = 'uk';
+ break;
+ case 'sq_AL' :
+ $language = 'sq';
+ break;
+ case 'ga_IE' :
+ $language = 'ga';
+ break;
+ case 'gu_IN' :
+ $language = 'gu';
+ break;
+ case 'hy_AM' :
+ $language = 'hy';
+ break;
+ case 'eo_EO' :
+ $language = 'eo';
+ break;
+ case 'ar_AR' :
+ $language = 'ar';
+ break;
+ case 'hr_HR' :
+ $language = 'hr';
+ break;
+ case 'cs_CS' :
+ $language = 'cs_CZ';
+ break;
+ case 'vi_VN' :
+ $language = 'vi';
+ break;
+ case 'ja_JP' :
+ $language = 'ja';
+ break;
+ case 'tr' :
+ $language = 'tr_TR';
+ break;
+ case 'be_BY' :
+ case 'be' :
+ $language = 'bel';
+ break;
+ }
+
+ $cmd = WPORGTRANSLATE_WPCLI . ' wporg-translate import-plugin-translations ' . escapeshellarg( "wp-plugins/{$project}/{$branch}" ) . ' ' . escapeshellarg( $language ) . ' ' . escapeshellarg( $file ) . ' --format=' . escapeshellarg( $ext );
+ echo shell_exec( $cmd . ' 2>&1' );
+ }
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryclii18nclassreadmeimportphp"></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/cli/i18n/class-readme-import.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/cli/i18n/class-readme-import.php 2016-06-21 08:49:44 UTC (rev 3514)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/cli/i18n/class-readme-import.php 2016-06-21 09:32:38 UTC (rev 3515)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -38,8 +38,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @throws Exception
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function import_from_tag( $tag ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wpdb;
-
</del><span class="cx" style="display: block; padding: 0 10px"> $files = SVN::ls( self::PLUGIN_SVN_BASE . "/{$this->plugin}/{$tag}" );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $files ) {
</span><span class="cx" style="display: block; padding: 0 10px"> throw new Exception( "Plugin has no files in {$tag}." );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -150,10 +148,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> throw new Exception( 'POT file not extracted.' );
</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">- parent::set_glotpress_for_plugin( $this->plugin, 'readme' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $result = $this->set_glotpress_for_plugin( $this->plugin, 'readme' );
+ if ( is_wp_error( $result ) ) {
+ throw new Exception( $result->get_error_message() );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $branch = ( 'trunk' === $tag ) ? 'dev' : 'stable';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- parent::import_pot_to_glotpress_project( $this->plugin, $branch, $pot_file, $str_priorities );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->import_pot_to_glotpress_project( $this->plugin, $branch, $pot_file, $str_priorities );
</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">@@ -165,7 +166,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function handle_translator_comment( $array, $key, $val ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ private function handle_translator_comment( $array, $key, $val ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $val = trim( preg_replace( '/[^a-z0-9]/i', ' ', $val ) ); // cleanup key names for display.
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $array[ $key ] ) ) {
</span></span></pre>
</div>
</div>
</body>
</html>