<!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][753] trunk: Adding missing translatable strings and some minor code cleanup.</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/753">753</a></dd>
<dt>Author</dt> <dd>markoheijnen</dd>
<dt>Date</dt> <dd>2013-05-01 20:56:56 +0000 (Wed, 01 May 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Adding missing translatable strings and some minor code cleanup. Props momo360modena. Fixes <a href="http://glotpress.trac.wordpress.org/ticket/57">#57</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkgptemplatesprofilephp">trunk/gp-templates/profile.php</a></li>
<li><a href="#trunkgptemplatesprojectformphp">trunk/gp-templates/project-form.php</a></li>
<li><a href="#trunkgptemplatesprojectpermissionsphp">trunk/gp-templates/project-permissions.php</a></li>
<li><a href="#trunkgptemplatestranslationrowphp">trunk/gp-templates/translation-row.php</a></li>
<li><a href="#trunkgptemplatestranslationsetformphp">trunk/gp-templates/translation-set-form.php</a></li>
<li><a href="#trunkpomopophp">trunk/pomo/po.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkgptemplatesprofilephp"></a>
<div class="modfile"><h4>Modified: trunk/gp-templates/profile.php (752 => 753)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-templates/profile.php 2013-05-01 19:56:08 UTC (rev 752)
+++ trunk/gp-templates/profile.php 2013-05-01 20:56:56 UTC (rev 753)
</span><span class="lines">@@ -16,7 +16,7 @@
</span><span class="cx"> }
</span><span class="cx"> ?>
</span><span class="cx"> <h2><?php _e( "Profile" ); ?></h2>
</span><del>-<form method="post">
</del><ins>+<form action="" method="post">
</ins><span class="cx"> <table class="form-table">
</span><span class="cx"> <tr>
</span><span class="cx"> <th><label for="per_page"><?php _e( "Number of items per page:" ); ?></label></th>
</span></span></pre></div>
<a id="trunkgptemplatesprojectformphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-templates/project-form.php (752 => 753)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-templates/project-form.php 2013-05-01 19:56:08 UTC (rev 752)
+++ trunk/gp-templates/project-form.php 2013-05-01 20:56:56 UTC (rev 753)
</span><span class="lines">@@ -1,24 +1,24 @@
</span><span class="cx"> <dl>
</span><del>- <dt><label for="project[name]"><?php _e('Name'); ?></label></dt>
</del><ins>+ <dt><label for="project[name]"><?php _e('Name'); ?></label></dt>
</ins><span class="cx"> <dd><input type="text" name="project[name]" value="<?php echo esc_html( $project->name ); ?>" id="project[name]"></dd>
</span><span class="cx">
</span><span class="cx"> <!-- TODO: make slug edit WordPress style -->
</span><del>- <dt><label for="project[slug]"><?php _e('Slug'); ?></label></dt>
</del><ins>+ <dt><label for="project[slug]"><?php _e('Slug'); ?></label></dt>
</ins><span class="cx"> <dd>
</span><span class="cx"> <input type="text" name="project[slug]" value="<?php echo esc_html( $project->slug ); ?>" id="project[slug]">
</span><span class="cx"> <small><?php _e('If you leave the slug empty, it will be derived from the name.'); ?></small>
</span><span class="cx"> </dd>
</span><span class="cx">
</span><del>- <dt><label for="project[description]"><?php _e('Description'); ?></label> <span class="ternary">can include HTML</span></dt>
</del><ins>+ <dt><label for="project[description]"><?php _e('Description'); ?></label> <span class="ternary"><?php _e('can include HTML'); ?></span></dt>
</ins><span class="cx"> <dd><textarea name="project[description]" rows="4" cols="40" id="project[description]"><?php echo esc_html( $project->description ); ?></textarea></dd>
</span><span class="cx">
</span><del>- <dt><label for="project[source_url_template]"><?php _e('Source file URL'); ?></label></dt>
</del><ins>+ <dt><label for="project[source_url_template]"><?php _e('Source file URL'); ?></label></dt>
</ins><span class="cx"> <dd>
</span><span class="cx"> <input type="text" value="<?php echo esc_html( $project->source_url_template ); ?>" name="project[source_url_template]" id="project[source_url_template]" style="width: 30em;" />
</span><span class="cx"> <span class="ternary"><?php _e('Public URL to a source file in the project. You can use <code>%file%</code> and <code>%line%</code>. Ex. <code>http://trac.example.org/browser/%file%#L%line%</code>'); ?></span>
</span><span class="cx"> </dd>
</span><span class="cx">
</span><del>- <dt><label for="project[parent_project_id]"><?php _e('Parent Project'); ?></label></dt>
</del><ins>+ <dt><label for="project[parent_project_id]"><?php _e('Parent Project'); ?></label></dt>
</ins><span class="cx"> <dd><?php echo gp_projects_dropdown( 'project[parent_project_id]', $project->parent_project_id); ?></dd>
</span><span class="cx">
</span><span class="cx"> <dt><label for="project[active]"><?php _e('Active'); ?></label> <input type="checkbox" id="project[active]" name="project[active]" <?php gp_checked( $project->active ); ?> /></dt>
</span></span></pre></div>
<a id="trunkgptemplatesprojectpermissionsphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-templates/project-permissions.php (752 => 753)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-templates/project-permissions.php 2013-05-01 19:56:08 UTC (rev 752)
+++ trunk/gp-templates/project-permissions.php 2013-05-01 20:56:56 UTC (rev 753)
</span><span class="lines">@@ -19,9 +19,9 @@
</span><span class="cx"> <li>
</span><span class="cx"> <span class="permission-action"><?php _e('user'); ?></span>
</span><span class="cx"> <span class="user"><?php echo esc_html( $permission->user->user_login ); ?></span>
</span><del>- <span class="permission-action">can <?php echo esc_html( $permission->action ); ?> strings with locale</span>
</del><ins>+ <span class="permission-action"><?php printf( __('can %s strings with locale'), esc_html( $permission->action ) ); ?></span>
</ins><span class="cx"> <span class="user"><?php echo esc_html( $permission->locale_slug ); ?></span>
</span><del>- <span class="permission-action">and slug</span>
</del><ins>+ <span class="permission-action"><?php _e('and slug'); ?></span>
</ins><span class="cx"> <span class="user"><?php echo esc_html( $permission->set_slug ); ?></span>
</span><span class="cx"> <a href="<?php echo gp_url_join( gp_url_current(), '-delete/'.$permission->id ); ?>" class="action delete"><?php _e('Remove'); ?></a>
</span><span class="cx"> </li>
</span><span class="lines">@@ -35,17 +35,17 @@
</span><span class="cx"> <li>
</span><span class="cx"> <span class="permission-action"><?php _e('user'); ?></span>
</span><span class="cx"> <span class="user"><?php echo esc_html( $permission->user->user_login ); ?></span>
</span><del>- <span class="permission-action">can <?php echo esc_html( $permission->action ); ?> strings with locale</span>
</del><ins>+ <span class="permission-action"><?php printf(__('can %s strings with locale'), esc_html( $permission->action )); ?></span>
</ins><span class="cx"> <span class="user"><?php echo esc_html( $permission->locale_slug ); ?></span>
</span><del>- <span class="permission-action">and slug</span>
</del><ins>+ <span class="permission-action"><?php _e('and slug'); ?></span>
</ins><span class="cx"> <span class="user"><?php echo esc_html( $permission->set_slug ); ?></span>
</span><del>- <span class="permission-action">in the project </span>
</del><ins>+ <span class="permission-action"><?php _e('in the project'); ?> </span>
</ins><span class="cx"> <span class="user"><?php gp_link_project( $permission->project, esc_html( $permission->project->name ) ); ?></span>
</span><span class="cx"> </li>
</span><span class="cx"> <?php endforeach; ?>
</span><span class="cx"> </ul>
</span><span class="cx"> <?php endif; ?>
</span><del>- <?php if ( !$permissions && !$parent_permissions ): ?>
</del><ins>+ <?php if ( ! $permissions && !$parent_permissions ): ?>
</ins><span class="cx"> <strong><?php _e('No validators defined for this project.'); ?></strong>
</span><span class="cx"> <?php endif; ?>
</span><span class="cx"> <form action="" method="post" class="secondary">
</span></span></pre></div>
<a id="trunkgptemplatestranslationrowphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-templates/translation-row.php (752 => 753)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-templates/translation-row.php 2013-05-01 19:56:08 UTC (rev 752)
+++ trunk/gp-templates/translation-row.php 2013-05-01 20:56:56 UTC (rev 753)
</span><span class="lines">@@ -10,6 +10,7 @@
</span><span class="cx"> );
</span><span class="cx"> $can_reject_self = (GP::$user->current()->user_login == $t->user_login && $t->translation_status == "waiting");
</span><span class="cx"> ?>
</span><ins>+
</ins><span class="cx"> <tr class="preview <?php echo $parity().' '.$status_class.' '.$warning_class.' '.$priority_class ?>" id="preview-<?php echo $t->row_id ?>" row="<?php echo $t->row_id; ?>">
</span><span class="cx"> <?php if ( $can_approve ) : ?><th scope="row" class="checkbox"><input type="checkbox" name="selected-row[]" /></th><?php endif; ?>
</span><span class="cx"> <?php /*
</span><span class="lines">@@ -93,13 +94,13 @@
</span><span class="cx"> <?php if ( $t->translation_status ): ?>
</span><span class="cx"> <?php if ( $can_approve ): ?>
</span><span class="cx"> <?php if ( $t->translation_status != 'current' ): ?>
</span><del>- <button class="approve" tabindex="-1"><strong>+</strong> Approve</button>
</del><ins>+ <button class="approve" tabindex="-1"><strong>+</strong> <?php _e('Approve'); ?></button>
</ins><span class="cx"> <?php endif; ?>
</span><span class="cx"> <?php if ( $t->translation_status != 'rejected' ): ?>
</span><del>- <button class="reject" tabindex="-1"><strong>−</strong> Reject</button>
</del><ins>+ <button class="reject" tabindex="-1"><strong>−</strong> <?php _e('Reject'); ?></button>
</ins><span class="cx"> <?php endif; ?>
</span><span class="cx"> <?php elseif ( $can_reject_self ): ?>
</span><del>- <button class="reject" tabindex="-1"><strong>−</strong> Reject Suggestion</button>
</del><ins>+ <button class="reject" tabindex="-1"><strong>−</strong> <?php _e('Reject Suggestion'); ?></button>
</ins><span class="cx"> <?php endif; ?>
</span><span class="cx"> <?php endif; ?>
</span><span class="cx"> </dd>
</span><span class="lines">@@ -164,8 +165,8 @@
</span><span class="cx"> ?>
</span><span class="cx"> <dt>More links:
</span><span class="cx"> <ul>
</span><del>- <li><a tabindex="-1" href="<?php echo $permalink; ?>" title="Permanent link to this translation">Permalink to this translation</a></li>
- <li><a tabindex="-1" href="<?php echo $original_history; ?>" title="Link to the history of translations of this original">All translations of this original</a></li>
</del><ins>+ <li><a tabindex="-1" href="<?php echo $permalink; ?>" title="<?php _e('Permanent link to this translation'); ?>"><?php _e('Permalink to this translation'); ?></a></li>
+ <li><a tabindex="-1" href="<?php echo $original_history; ?>" title="<?php _e('Link to the history of translations of this original'); ?>"><?php _e('All translations of this original'); ?></a></li>
</ins><span class="cx"> </ul>
</span><span class="cx"> </dt>
</span><span class="cx"> </dl>
</span></span></pre></div>
<a id="trunkgptemplatestranslationsetformphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-templates/translation-set-form.php (752 => 753)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-templates/translation-set-form.php 2013-05-01 19:56:08 UTC (rev 752)
+++ trunk/gp-templates/translation-set-form.php 2013-05-01 20:56:56 UTC (rev 753)
</span><span class="lines">@@ -1,18 +1,18 @@
</span><span class="cx"> <dl>
</span><del>- <dt><label for="set[locale]"><?php _e('Locale'); ?></label></dt>
</del><ins>+ <dt><label for="set[locale]"><?php _e('Locale'); ?></label></dt>
</ins><span class="cx"> <dd>
</span><span class="cx"> <?php echo gp_locales_dropdown( 'set[locale]', $set->locale ); ?>
</span><span class="cx"> <a href="#" id="copy"><?php _e('Use as name'); ?></a>
</span><span class="cx"> </dd>
</span><span class="cx">
</span><del>- <dt><label for="set[name]"><?php _e('Name'); ?></label></dt>
</del><ins>+ <dt><label for="set[name]"><?php _e('Name'); ?></label></dt>
</ins><span class="cx"> <dd><input type="text" name="set[name]" value="<?php echo esc_html( $set->name ); ?>" id="set[name]"></dd>
</span><span class="cx">
</span><span class="cx"> <!-- TODO: make slug edit WordPress style -->
</span><del>- <dt><label for="set[slug]"><?php _e('Slug'); ?></label></dt>
</del><ins>+ <dt><label for="set[slug]"><?php _e('Slug'); ?></label></dt>
</ins><span class="cx"> <dd><input type="text" name="set[slug]" value="<?php echo esc_html( $set->slug? $set->slug : 'default' ); ?>" id="set[slug]"></dd>
</span><span class="cx">
</span><del>- <dt><label for="set[project_id]"><?php _e('Project'); ?></label></dt>
</del><ins>+ <dt><label for="set[project_id]"><?php _e('Project'); ?></label></dt>
</ins><span class="cx"> <dd><?php echo gp_projects_dropdown( 'set[project_id]', $set->project_id ); ?></dd>
</span><span class="cx"> </dl>
</span><span class="cx"> <?php echo gp_js_focus_on( 'set[locale]' ); ?>
</span></span></pre></div>
<a id="trunkpomopophp"></a>
<div class="modfile"><h4>Modified: trunk/pomo/po.php (752 => 753)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/pomo/po.php 2013-05-01 19:56:08 UTC (rev 752)
+++ trunk/pomo/po.php 2013-05-01 20:56:56 UTC (rev 753)
</span><span class="lines">@@ -274,7 +274,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>
</div>
</body>
</html>