<!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][988] trunk/pomo: Allow falsy, but not explicitly null values for plural and context in entries</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://glotpress.trac.wordpress.org/changeset/988">988</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://glotpress.trac.wordpress.org/changeset/988","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>nbachiyski</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2014-11-21 17:32:10 +0000 (Fri, 21 Nov 2014)</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'>Allow falsy, but not explicitly null values for plural and context in entries
Recent database hiccup left us with a lot of empty string values. And honestly,
this way we will be more bulletproof.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkpomoentryphp">trunk/pomo/entry.php</a></li>
<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="trunkpomoentryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/pomo/entry.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/pomo/entry.php 2014-11-21 14:57:46 UTC (rev 987)
+++ trunk/pomo/entry.php 2014-11-21 17:32:10 UTC (rev 988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -49,7 +49,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ($args as $varname => $value) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->$varname = $value;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if (isset($args['plural'])) $this->is_plural = true;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if (isset($args['plural']) && $args['plural']) $this->is_plural = true;
</ins><span class="cx" style="display: block; padding: 0 10px"> if (!is_array($this->translations)) $this->translations = array();
</span><span class="cx" style="display: block; padding: 0 10px"> if (!is_array($this->references)) $this->references = array();
</span><span class="cx" style="display: block; padding: 0 10px"> if (!is_array($this->flags)) $this->flags = array();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -61,7 +61,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string|bool the key or false if the entry is empty
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function key() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if (is_null($this->singular)) return false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if (!$this->singular) return false;
</ins><span class="cx" style="display: block; padding: 0 10px"> // prepend context and EOT, like in MO files
</span><span class="cx" style="display: block; padding: 0 10px"> return !$this->context? $this->singular : $this->context.chr(4).$this->singular;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunkpomomophp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/pomo/mo.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/pomo/mo.php 2014-11-21 14:57:46 UTC (rev 987)
+++ trunk/pomo/mo.php 2014-11-21 17:32:10 UTC (rev 988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -103,7 +103,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> //TODO: warnings for control characters
</span><span class="cx" style="display: block; padding: 0 10px"> $exported = $entry->singular;
</span><span class="cx" style="display: block; padding: 0 10px"> if ($entry->is_plural) $exported .= chr(0).$entry->plural;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if (!is_null($entry->context)) $exported = $entry->context . chr(4) . $exported;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ($entry->context) $exported = $entry->context . chr(4) . $exported;
</ins><span class="cx" style="display: block; padding: 0 10px"> return $exported;
</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">@@ -258,4 +258,4 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $this->_nplurals;
</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">-endif;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+endif;
</ins></span></pre></div>
<a id="trunkpomopophp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/pomo/po.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/pomo/po.php 2014-11-21 14:57:46 UTC (rev 987)
+++ trunk/pomo/po.php 2014-11-21 17:32:10 UTC (rev 988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -194,13 +194,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * false if the entry is empty
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public static function export_entry(&$entry) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if (is_null($entry->singular)) return false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if (!$entry->singular) return false;
</ins><span class="cx" style="display: block; padding: 0 10px"> $po = array();
</span><span class="cx" style="display: block; padding: 0 10px"> if (!empty($entry->translator_comments)) $po[] = PO::comment_block($entry->translator_comments);
</span><span class="cx" style="display: block; padding: 0 10px"> if (!empty($entry->extracted_comments)) $po[] = PO::comment_block($entry->extracted_comments, '.');
</span><span class="cx" style="display: block; padding: 0 10px"> if (!empty($entry->references)) $po[] = PO::comment_block(implode(' ', $entry->references), ':');
</span><span class="cx" style="display: block; padding: 0 10px"> if (!empty($entry->flags)) $po[] = PO::comment_block(implode(", ", $entry->flags), ',');
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if (!is_null($entry->context)) $po[] = 'msgctxt '.PO::poify($entry->context);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ($entry->context) $po[] = 'msgctxt '.PO::poify($entry->context);
</ins><span class="cx" style="display: block; padding: 0 10px"> $po[] = 'msgid '.PO::poify($entry->singular);
</span><span class="cx" style="display: block; padding: 0 10px"> if (!$entry->is_plural) {
</span><span class="cx" style="display: block; padding: 0 10px"> $translation = empty($entry->translations)? '' : $entry->translations[0];
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -382,4 +382,4 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $s;
</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">-endif;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+endif;
</ins></span></pre>
</div>
</div>
</body>
</html>