<!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][798] trunk/gp-includes/formats/format_android.php: Add support for StringArray in Android XML.</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/798">798</a></dd>
<dt>Author</dt> <dd>markoheijnen</dd>
<dt>Date</dt> <dd>2013-07-09 17:28:24 +0000 (Tue, 09 Jul 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add support for StringArray in Android XML. Props peterdekr. See <a href="http://glotpress.trac.wordpress.org/ticket/251">#251</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkgpincludesformatsformat_androidphp">trunk/gp-includes/formats/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 (797 => 798)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-includes/formats/format_android.php 2013-07-08 18:29:57 UTC (rev 797)
+++ trunk/gp-includes/formats/format_android.php 2013-07-09 17:28:24 UTC (rev 798)
</span><span class="lines">@@ -10,28 +10,83 @@
</span><span class="cx"> function line( $string, $prepend_tabs = 0 ) {
</span><span class="cx"> $this->exported .= str_repeat( "\t", $prepend_tabs ) . "$string\n";
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function print_exported_file( $project, $locale, $translation_set, $entries ) {
</span><span class="cx"> $this->exported = '';
</span><span class="cx"> $this->line( '<?xml version="1.0" encoding="utf-8"?>' );
</span><span class="cx"> $this->line( '<resources>' );
</span><ins>+ $string_array_items = array();
+
</ins><span class="cx"> foreach( $entries as $entry ) {
</span><del>- if ( !preg_match( '/^[a-zA-Z0-9_]+$/', $entry->context ) ) {
</del><ins>+ if ( preg_match('/.+\[\d+\]$/', $entry->context ) ) {
+ //Array item found
+ $string_array_items[] = $entry;
+ continue;
+ }
+
+ if ( ! preg_match( '/^[a-zA-Z0-9_]+$/', $entry->context ) ) {
</ins><span class="cx"> error_log( 'Android XML Export: Bad Entry: '. $entry->context );
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> $this->line( '<string name="' . $entry->context . '">' . $this->escape( $entry->translations[0] ) . '</string>', 1 );
</span><span class="cx"> }
</span><ins>+
+ $this->string_arrays( $string_array_items );
+
</ins><span class="cx"> $this->line( '</resources>' );
</span><ins>+
</ins><span class="cx"> return $this->exported;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ function string_arrays($entries)
+ {
+ $mapping = array();
+
+ asort( $entries );
+
+ foreach( $entries as $entry )
+ {
+ $array_name = preg_replace( '/\[\d+\]$/', '', $entry->context );
+
+ if ( ! isset( $mapping[ $array_name ] ) )
+ $mapping[ $array_name ] = array();
+
+ //Because android doesn't fallback on the original language
+ //in string-arrays, we fill the non-translated ones with original language string.
+ $value = $entry->translations[0];
+
+ if ( ! $value )
+ $value = $entry->singular;
+
+ $mapping[ $array_name ][] = $this->escape( $value );
+ }
+
+ foreach ( array_keys( $mapping ) as $array_name )
+ {
+ $this->line( '<string-array name="' . $array_name . '">', 1 );
+
+ foreach ( $mapping[ $array_name ] as $item )
+ {
+ $this->line('<item>' . $item . '</item>', 2);
+ }
+
+ $this->line( '</string-array>', 1 );
+ }
+ }
+
</ins><span class="cx"> function read_translations_from_file( $file_name, $project = null ) {
</span><del>- if ( is_null( $project ) ) return false;
</del><ins>+ if ( is_null( $project ) )
+ return false;
+
</ins><span class="cx"> $translations = $this->read_originals_from_file( $file_name );
</span><del>- if ( !$translations ) return false;
</del><ins>+
+ if ( ! $translations )
+ return false;
+
</ins><span class="cx"> $originals = GP::$original->by_project_id( $project->id );
</span><span class="cx"> $new_translations = new Translations;
</span><ins>+
</ins><span class="cx"> foreach( $translations->entries as $key => $entry ) {
</span><span class="cx"> // we have been using read_originals_from_file to parse the file
</span><span class="cx"> // so we need to swap singular and translation
</span><span class="lines">@@ -43,23 +98,28 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- if ( !$entry->singular ) {
</del><ins>+
+ if ( ! $entry->singular ) {
</ins><span class="cx"> error_log( sprintf( __("Missing context %s in project #%d"), $entry->context, $project->id ) );
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $new_translations->add_entry( $entry );
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> return $new_translations;
</span><del>-
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function read_originals_from_file( $file_name ) {
</span><span class="cx"> $errors = libxml_use_internal_errors( 'true' );
</span><span class="cx"> $data = simplexml_load_string( file_get_contents( $file_name ) );
</span><span class="cx"> libxml_use_internal_errors( $errors );
</span><del>- if ( !is_object( $data ) ) return false;
</del><ins>+
+ if ( ! is_object( $data ) )
+ return false;
+
</ins><span class="cx"> $entries = new Translations;
</span><ins>+
</ins><span class="cx"> foreach( $data->string as $string ) {
</span><span class="cx"> $entry = new Translation_Entry();
</span><span class="cx"> $entry->context = (string)$string['name'];
</span><span class="lines">@@ -67,6 +127,25 @@
</span><span class="cx"> $entry->translations = array();
</span><span class="cx"> $entries->add_entry( $entry );
</span><span class="cx"> }
</span><ins>+
+ foreach ( $data->{'string-array'} as $string_array )
+ {
+ $array_name = (string) $string_array['name'];
+ $item_index = 0;
+
+ foreach ( $string_array->item as $item )
+ {
+ $entry = new Translation_Entry();
+ $entry->context = $array_name . "[$item_index]";
+ $entry->singular = $this->unescape( $item[0] );
+ $entry->translations = array();
+
+ $entries->add_entry( $entry );
+
+ $item_index++;
+ }
+ }
+
</ins><span class="cx"> return $entries;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>