<!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>[GlotPress][780] trunk/pomo: Make some methods static and stop using method output as input for another method in po.php and mo.php.</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">
<dt>Revision</dt> <dd><a href="https://glotpress.trac.wordpress.org/changeset/780">780</a></dd>
<dt>Author</dt> <dd>markoheijnen</dd>
<dt>Date</dt> <dd>2013-06-19 12:12:28 +0000 (Wed, 19 Jun 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make some methods static and stop using method output as input for another method in po.php and mo.php. See <a href="http://glotpress.trac.wordpress.org/ticket/220">#220</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkpomomophp">trunk/pomo/mo.php</a></li>
<li><a href="#trunkpomopophp">trunk/pomo/po.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkpomomophp"></a>
<div class="modfile"><h4>Modified: trunk/pomo/mo.php (779 => 780)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/pomo/mo.php 2013-06-19 12:10:01 UTC (rev 779)
+++ trunk/pomo/mo.php 2013-06-19 12:12:28 UTC (rev 780)
</span><span class="lines">@@ -207,7 +207,8 @@
</span><span class="cx"> $translation = $reader->substr( $strings, $t['pos'], $t['length'] );
</span><span class="cx">
</span><span class="cx"> if ('' === $original) {
</span><del>- $this->set_headers($this->make_headers($translation));
</del><ins>+ $headers = $this->make_headers($translation);
+ $this->set_headers($headers);
</ins><span class="cx"> } else {
</span><span class="cx"> $entry = &$this->make_entry($original, $translation);
</span><span class="cx"> $this->entries[$entry->key()] = &$entry;
</span></span></pre></div>
<a id="trunkpomopophp"></a>
<div class="modfile"><h4>Modified: trunk/pomo/po.php (779 => 780)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/pomo/po.php 2013-06-19 12:10:01 UTC (rev 779)
+++ trunk/pomo/po.php 2013-06-19 12:12:28 UTC (rev 780)
</span><span class="lines">@@ -97,7 +97,7 @@
</span><span class="cx"> * @param string $string the string to format
</span><span class="cx"> * @return string the poified string
</span><span class="cx"> */
</span><del>- function poify($string) {
</del><ins>+ public static function poify($string) {
</ins><span class="cx"> $quote = '"';
</span><span class="cx"> $slash = '\\';
</span><span class="cx"> $newline = "\n";
</span><span class="lines">@@ -128,7 +128,7 @@
</span><span class="cx"> * @param string $string PO-formatted string
</span><span class="cx"> * @return string enascaped string
</span><span class="cx"> */
</span><del>- function unpoify($string) {
</del><ins>+ public static function unpoify($string) {
</ins><span class="cx"> $escapes = array('t' => "\t", 'n' => "\n", '\\' => '\\');
</span><span class="cx"> $lines = array_map('trim', explode("\n", $string));
</span><span class="cx"> $lines = array_map(array('PO', 'trim_quotes'), $lines);
</span><span class="lines">@@ -160,7 +160,7 @@
</span><span class="cx"> * @param string $string prepend lines in this string
</span><span class="cx"> * @param string $with prepend lines with this string
</span><span class="cx"> */
</span><del>- function prepend_each_line($string, $with) {
</del><ins>+ public static function prepend_each_line($string, $with) {
</ins><span class="cx"> $php_with = var_export($with, true);
</span><span class="cx"> $lines = explode("\n", $string);
</span><span class="cx"> // do not prepend the string on the last empty line, artefact by explode
</span><span class="lines">@@ -180,7 +180,7 @@
</span><span class="cx"> * @param string $char character to denote a special PO comment,
</span><span class="cx"> * like :, default is a space
</span><span class="cx"> */
</span><del>- function comment_block($text, $char=' ') {
</del><ins>+ public static function comment_block($text, $char=' ') {
</ins><span class="cx"> $text = wordwrap($text, PO_MAX_LINE_LEN - 3);
</span><span class="cx"> return PO::prepend_each_line($text, "#$char ");
</span><span class="cx"> }
</span><span class="lines">@@ -193,7 +193,7 @@
</span><span class="cx"> * @return string|bool PO-style formatted string for the entry or
</span><span class="cx"> * false if the entry is empty
</span><span class="cx"> */
</span><del>- function export_entry(&$entry) {
</del><ins>+ public static function export_entry(&$entry) {
</ins><span class="cx"> if (is_null($entry->singular)) return false;
</span><span class="cx"> $po = array();
</span><span class="cx"> if (!empty($entry->translator_comments)) $po[] = PO::comment_block($entry->translator_comments);
</span><span class="lines">@@ -223,7 +223,8 @@
</span><span class="cx"> $res = $this->read_entry($f, $lineno);
</span><span class="cx"> if (!$res) break;
</span><span class="cx"> if ($res['entry']->singular == '') {
</span><del>- $this->set_headers($this->make_headers($res['entry']->translations[0]));
</del><ins>+ $headers = $this->make_headers($res['entry']->translations[0]);
+ $this->set_headers($headers);
</ins><span class="cx"> } else {
</span><span class="cx"> $this->add_entry($res['entry']);
</span><span class="cx"> }
</span><span class="lines">@@ -375,7 +376,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function trim_quotes($s) {
</del><ins>+ public static function trim_quotes($s) {
</ins><span class="cx"> if ( substr($s, 0, 1) == '"') $s = substr($s, 1);
</span><span class="cx"> if ( substr($s, -1, 1) == '"') $s = substr($s, 0, -1);
</span><span class="cx"> return $s;
</span></span></pre>
</div>
</div>
</body>
</html>