<!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][896] trunk: Add support for comments in Android import.</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/896">896</a></dd>
<dt>Author</dt> <dd>markoheijnen</dd>
<dt>Date</dt> <dd>2014-05-07 09:36:26 +0000 (Wed, 07 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add support for comments in Android import. Fixes <a href="http://glotpress.trac.wordpress.org/ticket/265">#265</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkgpincludesformatsformat_androidphp">trunk/gp-includes/formats/format_android.php</a></li>
<li><a href="#trunktdataoriginalsandroidxml">trunk/t/data/originals.android.xml</a></li>
<li><a href="#trunktdatatranslationandroidxml">trunk/t/data/translation.android.xml</a></li>
<li><a href="#trunktteststest_format_androidphp">trunk/t/tests/test_format_android.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkgpincludesformatsformat_androidphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-includes/formats/format_android.php (895 => 896)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-includes/formats/format_android.php 2014-05-06 22:07:04 UTC (rev 895)
+++ trunk/gp-includes/formats/format_android.php 2014-05-07 09:36:26 UTC (rev 896)
</span><span class="lines">@@ -115,7 +115,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function read_originals_from_file( $file_name ) {
</span><del>- $errors = libxml_use_internal_errors( 'true' );
</del><ins>+ $errors = libxml_use_internal_errors( true );
</ins><span class="cx"> $data = simplexml_load_string( file_get_contents( $file_name ) );
</span><span class="cx"> libxml_use_internal_errors( $errors );
</span><span class="cx">
</span><span class="lines">@@ -133,6 +133,11 @@
</span><span class="cx"> $entry->context = (string)$string['name'];
</span><span class="cx"> $entry->singular = $this->unescape( (string)$string[0] );
</span><span class="cx"> $entry->translations = array();
</span><ins>+
+ if ( isset( $string['comment'] ) && $string['comment'] ) {
+ $entry->extracted_comments = $string['comment'];
+ }
+
</ins><span class="cx"> $entries->add_entry( $entry );
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunktdataoriginalsandroidxml"></a>
<div class="modfile"><h4>Modified: trunk/t/data/originals.android.xml (895 => 896)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/t/data/originals.android.xml 2014-05-06 22:07:04 UTC (rev 895)
+++ trunk/t/data/originals.android.xml 2014-05-07 09:36:26 UTC (rev 896)
</span><span class="lines">@@ -8,4 +8,5 @@
</span><span class="cx"> <string name="with_lt">you < me</string>
</span><span class="cx"> <string name="with_gt">me > you</string>
</span><span class="cx"> <string name="with_amps">me & you are not &amp;</string>
</span><ins>+ <string name="with_comment" comment="Me, myself & Irene">baba</string>
</ins><span class="cx"> </resources>
</span></span></pre></div>
<a id="trunktdatatranslationandroidxml"></a>
<div class="modfile"><h4>Modified: trunk/t/data/translation.android.xml (895 => 896)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/t/data/translation.android.xml 2014-05-06 22:07:04 UTC (rev 895)
+++ trunk/t/data/translation.android.xml 2014-05-07 09:36:26 UTC (rev 896)
</span><span class="lines">@@ -8,4 +8,5 @@
</span><span class="cx"> <string name="with_lt">ти < аз</string>
</span><span class="cx"> <string name="with_gt">аз > ти</string>
</span><span class="cx"> <string name="with_amps">аз & ти не сме &amp;</string>
</span><ins>+ <string name="with_comment">баба</string>
</ins><span class="cx"> </resources>
</span></span></pre></div>
<a id="trunktteststest_format_androidphp"></a>
<div class="modfile"><h4>Modified: trunk/t/tests/test_format_android.php (895 => 896)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/t/tests/test_format_android.php 2014-05-06 22:07:04 UTC (rev 895)
+++ trunk/t/tests/test_format_android.php 2014-05-07 09:36:26 UTC (rev 896)
</span><span class="lines">@@ -13,6 +13,7 @@
</span><span class="cx"> array('with_lt', 'you < me', 'ти < аз'),
</span><span class="cx"> array('with_gt', 'me > you', "аз > ти"),
</span><span class="cx"> array('with_amps', 'me & you are not &', 'аз & ти не сме &'),
</span><ins>+ array('with_comment', 'baba', 'баба', 'Me, myself & Irene'),
</ins><span class="cx"> );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -34,11 +35,12 @@
</span><span class="cx"> $translations = $this->android->read_originals_from_file( 'data/originals.android.xml' );
</span><span class="cx">
</span><span class="cx"> foreach( $this->entries as $sample ) {
</span><del>- list( $context, $original, $translation ) = $sample;
</del><ins>+ list( $context, $original, $translation, $comment ) = $sample;
</ins><span class="cx"> $translatable_entry = new Translation_Entry( array('singular' => $original, 'context' => $context) );
</span><span class="cx"> $entry = $translations->translate_entry( $translatable_entry );
</span><span class="cx"> $this->assertEquals( $original, $entry->singular );
</span><span class="cx"> $this->assertEquals( $context, $entry->context );
</span><ins>+ $this->assertEquals( $comment, $entry->extracted_comments );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>