<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[13228] trunk/wp-includes/pomo: Sync pomo.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13228">13228</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-02-19 18:01:50 +0000 (Fri, 19 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Sync pomo. Props nbachiyski. fixes <a href="http://trac.wordpress.org/ticket/11832">#11832</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludespomoentryphp">trunk/wp-includes/pomo/entry.php</a></li>
<li><a href="#trunkwpincludespomomophp">trunk/wp-includes/pomo/mo.php</a></li>
<li><a href="#trunkwpincludespomopophp">trunk/wp-includes/pomo/po.php</a></li>
<li><a href="#trunkwpincludespomostreamsphp">trunk/wp-includes/pomo/streams.php</a></li>
<li><a href="#trunkwpincludespomotranslationsphp">trunk/wp-includes/pomo/translations.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludespomoentryphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/pomo/entry.php (13227 => 13228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/pomo/entry.php 2010-02-19 17:56:40 UTC (rev 13227)
+++ trunk/wp-includes/pomo/entry.php 2010-02-19 18:01:50 UTC (rev 13228)
</span><span class="lines">@@ -2,7 +2,7 @@
</span><span class="cx"> /**
</span><span class="cx"> * Contains Translation_Entry class
</span><span class="cx"> *
</span><del>- * @version $Id: entry.php 351 2009-12-03 11:39:08Z nbachiyski $
</del><ins>+ * @version $Id: entry.php 406 2010-02-07 11:10:24Z nbachiyski $
</ins><span class="cx"> * @package pomo
</span><span class="cx"> * @subpackage entry
</span><span class="cx"> */
</span></span></pre></div>
<a id="trunkwpincludespomomophp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/pomo/mo.php (13227 => 13228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/pomo/mo.php 2010-02-19 17:56:40 UTC (rev 13227)
+++ trunk/wp-includes/pomo/mo.php 2010-02-19 18:01:50 UTC (rev 13228)
</span><span class="lines">@@ -2,7 +2,7 @@
</span><span class="cx"> /**
</span><span class="cx"> * Class for working with MO files
</span><span class="cx"> *
</span><del>- * @version $Id: mo.php 293 2009-11-12 15:43:50Z nbachiyski $
</del><ins>+ * @version $Id: mo.php 406 2010-02-07 11:10:24Z nbachiyski $
</ins><span class="cx"> * @package pomo
</span><span class="cx"> * @subpackage mo
</span><span class="cx"> */
</span><span class="lines">@@ -201,7 +201,7 @@
</span><span class="cx"> * 0x00 as a plural translations separator
</span><span class="cx"> */
</span><span class="cx"> function &make_entry($original, $translation) {
</span><del>- $entry = & new Translation_Entry();
</del><ins>+ $entry = new Translation_Entry();
</ins><span class="cx"> // look for context
</span><span class="cx"> $parts = explode(chr(4), $original);
</span><span class="cx"> if (isset($parts[1])) {
</span></span></pre></div>
<a id="trunkwpincludespomopophp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/pomo/po.php (13227 => 13228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/pomo/po.php 2010-02-19 17:56:40 UTC (rev 13227)
+++ trunk/wp-includes/pomo/po.php 2010-02-19 18:01:50 UTC (rev 13228)
</span><span class="lines">@@ -2,7 +2,7 @@
</span><span class="cx"> /**
</span><span class="cx"> * Class for working with PO files
</span><span class="cx"> *
</span><del>- * @version $Id: po.php 283 2009-09-23 16:21:51Z nbachiyski $
</del><ins>+ * @version $Id: po.php 406 2010-02-07 11:10:24Z nbachiyski $
</ins><span class="cx"> * @package pomo
</span><span class="cx"> * @subpackage po
</span><span class="cx"> */
</span><span class="lines">@@ -254,7 +254,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx"> // add comment
</span><del>- $this->add_comment_to_entry($entry, $line);
</del><ins>+ $this->add_comment_to_entry($entry, $line);;
</ins><span class="cx"> } elseif (preg_match('/^msgctxt\s+(".*")/', $line, $m)) {
</span><span class="cx"> if ($is_final($context)) {
</span><span class="cx"> PO::read_line($f, 'put-back');
</span></span></pre></div>
<a id="trunkwpincludespomostreamsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/pomo/streams.php (13227 => 13228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/pomo/streams.php 2010-02-19 17:56:40 UTC (rev 13227)
+++ trunk/wp-includes/pomo/streams.php 2010-02-19 18:01:50 UTC (rev 13228)
</span><span class="lines">@@ -3,7 +3,7 @@
</span><span class="cx"> * Classes, which help reading streams of data from files.
</span><span class="cx"> * Based on the classes from Danilo Segan <danilo@kvota.net>
</span><span class="cx"> *
</span><del>- * @version $Id: streams.php 293 2009-11-12 15:43:50Z nbachiyski $
</del><ins>+ * @version $Id: streams.php 406 2010-02-07 11:10:24Z nbachiyski $
</ins><span class="cx"> * @package pomo
</span><span class="cx"> * @subpackage streams
</span><span class="cx"> */
</span></span></pre></div>
<a id="trunkwpincludespomotranslationsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/pomo/translations.php (13227 => 13228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/pomo/translations.php 2010-02-19 17:56:40 UTC (rev 13227)
+++ trunk/wp-includes/pomo/translations.php 2010-02-19 18:01:50 UTC (rev 13228)
</span><span class="lines">@@ -2,7 +2,7 @@
</span><span class="cx"> /**
</span><span class="cx"> * Class for a set of entries for translation and their associated headers
</span><span class="cx"> *
</span><del>- * @version $Id: translations.php 291 2009-10-21 05:46:08Z nbachiyski $
</del><ins>+ * @version $Id: translations.php 406 2010-02-07 11:10:24Z nbachiyski $
</ins><span class="cx"> * @package pomo
</span><span class="cx"> * @subpackage translations
</span><span class="cx"> */
</span><span class="lines">@@ -104,7 +104,9 @@
</span><span class="cx"> * @return void
</span><span class="cx"> **/
</span><span class="cx"> function merge_with(&$other) {
</span><del>- $this->entries = array_merge($this->entries, $other->entries);
</del><ins>+ foreach( $other->entries as $entry ) {
+ $this->entries[$entry->key()] = $entry;
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>