<!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][728] trunk: Improve the display of export format names in the UI.</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, #logmsg > ol { margin-left: 0; 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/728">728</a></dd>
<dt>Author</dt> <dd>westi</dd>
<dt>Date</dt> <dd>2012-10-31 22:10:11 +0000 (Wed, 31 Oct 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Improve the display of export format names in the UI. See <a href="http://glotpress.trac.wordpress.org/ticket/225">#225</a> props fmestrone. </pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkgpincludesformatsformat_androidphp">trunk/gp-includes/formats/format_android.php</a></li>
<li><a href="#trunkgpincludesformatsformat_pomophp">trunk/gp-includes/formats/format_pomo.php</a></li>
<li><a href="#trunkgpincludesformatsformat_resxphp">trunk/gp-includes/formats/format_resx.php</a></li>
<li><a href="#trunkgpincludesformatsformat_rrcphp">trunk/gp-includes/formats/format_rrc.php</a></li>
<li><a href="#trunkgpincludesformatsformat_stringsphp">trunk/gp-includes/formats/format_strings.php</a></li>
<li><a href="#trunkgptemplatesprojectimportphp">trunk/gp-templates/project-import.php</a></li>
<li><a href="#trunkgptemplatestranslationsphp">trunk/gp-templates/translations.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 (727 => 728)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-includes/formats/format_android.php 2012-10-31 20:10:42 UTC (rev 727)
+++ trunk/gp-includes/formats/format_android.php 2012-10-31 22:10:11 UTC (rev 728)
</span><span class="lines">@@ -2,6 +2,7 @@
</span><span class="cx">
</span><span class="cx"> class GP_Format_Android {
</span><span class="cx">
</span><ins>+ var $name = 'Android XML (.xml)';
</ins><span class="cx"> var $extension = 'xml';
</span><span class="cx">
</span><span class="cx"> var $exported = '';
</span></span></pre></div>
<a id="trunkgpincludesformatsformat_pomophp"></a>
<div class="modfile"><h4>Modified: trunk/gp-includes/formats/format_pomo.php (727 => 728)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-includes/formats/format_pomo.php 2012-10-31 20:10:42 UTC (rev 727)
+++ trunk/gp-includes/formats/format_pomo.php 2012-10-31 22:10:11 UTC (rev 728)
</span><span class="lines">@@ -2,6 +2,7 @@
</span><span class="cx">
</span><span class="cx"> class GP_Format_PO {
</span><span class="cx">
</span><ins>+ var $name = 'Portable Object Message Catalog (.po)';
</ins><span class="cx"> var $extension = 'po';
</span><span class="cx"> var $class = 'PO';
</span><span class="cx">
</span><span class="lines">@@ -44,6 +45,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> class GP_Format_MO extends GP_Format_PO {
</span><ins>+ var $name = 'Machine Object Message Catalog (.mo)';
</ins><span class="cx"> var $extension = 'mo';
</span><span class="cx"> var $class = 'MO';
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkgpincludesformatsformat_resxphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-includes/formats/format_resx.php (727 => 728)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-includes/formats/format_resx.php 2012-10-31 20:10:42 UTC (rev 727)
+++ trunk/gp-includes/formats/format_resx.php 2012-10-31 22:10:11 UTC (rev 728)
</span><span class="lines">@@ -2,6 +2,7 @@
</span><span class="cx">
</span><span class="cx"> class GP_Format_ResX {
</span><span class="cx">
</span><ins>+ var $name = '.NET Resource (.resx)';
</ins><span class="cx"> var $extension = 'resx.xml';
</span><span class="cx">
</span><span class="cx"> var $exported = '';
</span></span></pre></div>
<a id="trunkgpincludesformatsformat_rrcphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-includes/formats/format_rrc.php (727 => 728)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-includes/formats/format_rrc.php 2012-10-31 20:10:42 UTC (rev 727)
+++ trunk/gp-includes/formats/format_rrc.php 2012-10-31 22:10:11 UTC (rev 728)
</span><span class="lines">@@ -2,6 +2,7 @@
</span><span class="cx">
</span><span class="cx"> class GP_Format_RRC {
</span><span class="cx">
</span><ins>+ var $name = 'Blackberry Resource (.rrc)';
</ins><span class="cx"> var $extension = 'rrc';
</span><span class="cx">
</span><span class="cx"> function print_exported_file( $project, $locale, $translation_set, $entries ) {
</span></span></pre></div>
<a id="trunkgpincludesformatsformat_stringsphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-includes/formats/format_strings.php (727 => 728)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-includes/formats/format_strings.php 2012-10-31 20:10:42 UTC (rev 727)
+++ trunk/gp-includes/formats/format_strings.php 2012-10-31 22:10:11 UTC (rev 728)
</span><span class="lines">@@ -2,6 +2,7 @@
</span><span class="cx">
</span><span class="cx"> class GP_Format_Strings {
</span><span class="cx">
</span><ins>+ var $name = 'Mac OS X / iOS Strings File (.strings)';
</ins><span class="cx"> var $extension = 'strings';
</span><span class="cx">
</span><span class="cx"> var $exported = '';
</span></span></pre></div>
<a id="trunkgptemplatesprojectimportphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-templates/project-import.php (727 => 728)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-templates/project-import.php 2012-10-31 20:10:42 UTC (rev 727)
+++ trunk/gp-templates/project-import.php 2012-10-31 22:10:11 UTC (rev 728)
</span><span class="lines">@@ -11,8 +11,11 @@
</span><span class="cx"> <dt><label for="import-file"><?php _e('Import File:'); ?></label></dt>
</span><span class="cx"> <dd><input type="file" name="import-file" id="import-file" /></dd>
</span><span class="cx"> <?php
</span><del>- $format_slugs = array_keys( GP::$formats );
- $format_dropdown = gp_select( 'format', array_combine( $format_slugs, $format_slugs ), 'po' );
</del><ins>+ $format_options = array();
+ foreach ( GP::$formats as $slug => $format ) {
+ $format_options[$slug] = $format->name;
+ }
+ $format_dropdown = gp_select( 'format', $format_options, 'po' );
</ins><span class="cx"> ?>
</span><span class="cx"> <dt><label for="format"><?php _e('Format:'); ?></label></dt>
</span><span class="cx"> <dd><?php echo $format_dropdown; ?></dd>
</span></span></pre></div>
<a id="trunkgptemplatestranslationsphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-templates/translations.php (727 => 728)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-templates/translations.php 2012-10-31 20:10:42 UTC (rev 727)
+++ trunk/gp-templates/translations.php 2012-10-31 22:10:11 UTC (rev 728)
</span><span class="lines">@@ -171,9 +171,12 @@
</span><span class="cx"> }
</span><span class="cx"> $export_url = gp_url_project( $project, array( $locale->slug, $translation_set->slug, 'export-translations' ) );
</span><span class="cx"> $export_link = gp_link_get( $export_url , __('Export'), array('id' => 'export', 'filters' => add_query_arg( array( 'filters' => $filters ), $export_url ) ) );
</span><del>- $format_slugs = array_keys( GP::$formats );
</del><ins>+ $format_options = array();
+ foreach ( GP::$formats as $slug => $format ) {
+ $format_options[$slug] = $format->name;
+ }
</ins><span class="cx"> $what_dropdown = gp_select( 'what-to-export', array('all' => _x('all current', 'export choice'), 'filtered' => _x('only matching the filter', 'export choice')), 'all' );
</span><del>- $format_dropdown = gp_select( 'export-format', array_combine( $format_slugs, $format_slugs ), 'po' );
</del><ins>+ $format_dropdown = gp_select( 'export-format', $format_options, 'po' );
</ins><span class="cx"> /* translators: 1: export 2: what to export dropdown (all/filtered) 3: export format */
</span><span class="cx"> $footer_links[] = sprintf( __('%1$s %2$s as %3$s'), $export_link, $what_dropdown, $format_dropdown );
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>