<!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>[31314] trunk/tools/i18n/makepot.php: i18n tools: Tabs, not spaces for indentation.</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="https://core.trac.wordpress.org/changeset/31314">31314</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/31314","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>2015-01-31 19:51:03 +0000 (Sat, 31 Jan 2015)</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'>i18n tools: Tabs, not spaces for indentation.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktoolsi18nmakepotphp">trunk/tools/i18n/makepot.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktoolsi18nmakepotphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tools/i18n/makepot.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tools/i18n/makepot.php 2015-01-31 19:37:12 UTC (rev 31313)
+++ trunk/tools/i18n/makepot.php 2015-01-31 19:51:03 UTC (rev 31314)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -237,7 +237,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $this->wp_generic( $dir, array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'project' => 'wp-core', 'output' => $output,
</span><span class="cx" style="display: block; padding: 0 10px"> 'extract_not_gettexted' => true,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'not_gettexted_files_filter' => array( $this, 'is_not_ms_file' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'not_gettexted_files_filter' => array( $this, 'is_not_ms_file' ),
</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">@@ -246,7 +246,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $this->wp_generic( $dir, array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'project' => 'wp-frontend', 'output' => $output,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'includes' => array(), 'excludes' => array( 'wp-admin/.*', 'wp-content/themes/.*' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'includes' => array(),
+ 'excludes' => array( 'wp-admin/.*', 'wp-content/themes/.*' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'default_output' => 'wordpress.pot',
</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">@@ -263,24 +264,26 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->wp_generic( $dir, array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'project' => 'wp-admin', 'output' => $output,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'includes' => array( 'wp-admin/.*' ), 'excludes' => array( 'wp-admin/includes/continents-cities\.php', 'wp-admin/network/.*', 'wp-admin/network.php' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'includes' => array( 'wp-admin/.*' ),
+ 'excludes' => array( 'wp-admin/network/.*', 'wp-admin/network.php' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'default_output' => 'wordpress-admin.pot',
</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"> if ( ! $result )
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $potextmeta = new PotExtMeta;
- $result = $potextmeta->append( "$dir/wp-content/plugins/akismet/akismet.php", $output );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $potextmeta = new PotExtMeta;
+ $result = $potextmeta->append( "$dir/wp-content/plugins/akismet/akismet.php", $output );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! $result )
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $potextmeta->append( "$dir/wp-content/plugins/hello.php", $output );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $result )
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* Adding non-gettexted strings can repeat some phrases */
- $output_shell = escapeshellarg($output);
- system("msguniq $output_shell -o $output_shell");
</del><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* Adding non-gettexted strings can repeat some phrases */
+ $output_shell = escapeshellarg( $output );
+ system( "msguniq $output_shell -o $output_shell" );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $common_pot = $this->tempnam( 'common.pot' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $common_pot )
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -309,7 +312,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->wp_generic( $dir, array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'project' => 'wp-network-admin', 'output' => $output,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'includes' => array( 'wp-admin/network/.*', 'wp-admin/network.php' ), 'excludes' => array(),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'includes' => array( 'wp-admin/network/.*', 'wp-admin/network.php' ),
+ 'excludes' => array(),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'default_output' => 'wordpress-admin-network.pot',
</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">@@ -337,7 +341,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> $ms_result = $this->wp_generic( $dir, array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'project' => 'wp-ms', 'output' => $output,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'includes' => $this->ms_files, 'excludes' => array(),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'includes' => $this->ms_files,
+ 'excludes' => array(),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'default_output' => 'wordpress-ms.pot',
</span><span class="cx" style="display: block; padding: 0 10px"> 'extract_not_gettexted' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'not_gettexted_files_filter' => array( $this, 'is_ms_file' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -359,7 +364,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !file_exists( "$dir/$continents_path" ) ) return false;
</span><span class="cx" style="display: block; padding: 0 10px"> return $this->wp_generic( $dir, array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'project' => 'wp-tz', 'output' => $output,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'includes' => array($continents_path), 'excludes' => array(),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'includes' => array( $continents_path ),
+ 'excludes' => array(),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'default_output' => 'wordpress-continents-cities.pot',
</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>