<!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][749] trunk/gp-includes: Added error message when the validation isn't passed for the first translated string.</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/749">749</a></dd>
<dt>Author</dt> <dd>markoheijnen</dd>
<dt>Date</dt> <dd>2013-04-27 12:37:00 +0000 (Sat, 27 Apr 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Added error message when the validation isn't passed for the first translated string.
Props Japh. see <a href="http://glotpress.trac.wordpress.org/ticket/149">#149</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkgpincludesroutestranslationphp">trunk/gp-includes/routes/translation.php</a></li>
<li><a href="#trunkgpincludesvalidationphp">trunk/gp-includes/validation.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkgpincludesroutestranslationphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-includes/routes/translation.php (748 => 749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-includes/routes/translation.php 2013-04-26 17:37:48 UTC (rev 748)
+++ trunk/gp-includes/routes/translation.php 2013-04-27 12:37:00 UTC (rev 749)
</span><span class="lines">@@ -97,35 +97,50 @@
</span><span class="cx">
</span><span class="cx"> $output = array();
</span><span class="cx"> foreach( gp_post( 'translation', array() ) as $original_id => $translations) {
</span><del>- $data = compact('original_id');
</del><ins>+ $data = compact('original_id');
</ins><span class="cx"> $data['user_id'] = GP::$user->current()->id;
</span><del>- $data['translation_set_id'] = $translation_set->id;
- foreach( range( 0, GP::$translation->get_static( 'number_of_plural_translations' ) ) as $i ) {
- if ( isset( $translations[$i] ) ) $data["translation_$i"] = $translations[$i];
- }
- if ( $this->can( 'approve', 'translation-set', $translation_set->id ) || $this->can( 'write', 'project', $project->id ) ) {
</del><ins>+ $data['translation_set_id'] = $translation_set->id;
+
+ foreach( range( 0, GP::$translation->get_static( 'number_of_plural_translations' ) ) as $i ) {
+ if ( isset( $translations[$i] ) ) $data["translation_$i"] = $translations[$i];
+ }
+
+ if ( $this->can( 'approve', 'translation-set', $translation_set->id ) || $this->can( 'write', 'project', $project->id ) )
</ins><span class="cx"> $data['status'] = 'current';
</span><del>- } else {
</del><ins>+ else
</ins><span class="cx"> $data['status'] = 'waiting';
</span><del>- }
</del><ins>+
</ins><span class="cx"> $original = GP::$original->get( $original_id );
</span><span class="cx"> $data['warnings'] = GP::$translation_warnings->check( $original->singular, $original->plural, $translations, $locale );
</span><del>- // TODO: validate
</del><ins>+
</ins><span class="cx"> $translation = GP::$translation->create( $data );
</span><del>- if ( 'current' == $data['status'] ) {
- $translation->set_status( 'current' );
</del><ins>+ if ( ! $translation->validate() ) {
+ $error_output = '<ul>';
+ foreach ($translation->errors as $error) {
+ $error_output .= '<li>' . $error . '</li>';
+ }
+ $error_output .= '</ul>';
+ $translation->delete();
+ $this->die_with_error( $error_output, 200 );
</ins><span class="cx"> }
</span><del>- wp_cache_delete( $translation_set->id, 'translation_set_status_breakdown' );
- $translations = GP::$translation->for_translation( $project, $translation_set, 'no-limit', array('translation_id' => $translation->id), array() );
- if ( $translations ) {
- $t = $translations[0];
- $parity = returner( 'even' );
- $can_edit = GP::$user->logged_in();
- $can_write = $this->can( 'write', 'project', $project->id );
- $can_approve = $this->can( 'approve', 'translation-set', $translation_set->id );
- $output[$original_id] = gp_tmpl_get_output( 'translation-row', get_defined_vars() );
- } else {
- $output[$original_id] = false;
</del><ins>+ else {
+ if ( 'current' == $data['status'] )
+ $translation->set_status( 'current' );
+
+ wp_cache_delete( $translation_set->id, 'translation_set_status_breakdown' );
+ $translations = GP::$translation->for_translation( $project, $translation_set, 'no-limit', array('translation_id' => $translation->id), array() );
+
+ if ( $translations ) {
+ $t = $translations[0];
+ $parity = returner( 'even' );
+ $can_edit = GP::$user->logged_in();
+ $can_write = $this->can( 'write', 'project', $project->id );
+ $can_approve = $this->can( 'approve', 'translation-set', $translation_set->id );
+ $output[$original_id] = gp_tmpl_get_output( 'translation-row', get_defined_vars() );
+ }
+ else {
+ $output[$original_id] = false;
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> echo json_encode( $output );
</span></span></pre></div>
<a id="trunkgpincludesvalidationphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-includes/validation.php (748 => 749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-includes/validation.php 2013-04-26 17:37:48 UTC (rev 748)
+++ trunk/gp-includes/validation.php 2013-04-27 12:37:00 UTC (rev 749)
</span><span class="lines">@@ -50,6 +50,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> $verdict = true;
</span><ins>+
</ins><span class="cx"> foreach( $this->rules[$field] as $rule ) {
</span><span class="cx"> $callback = GP_Validators::get( $rule['rule'] );
</span><span class="cx"> if ( is_null( $callback ) ) {
</span><span class="lines">@@ -79,8 +80,19 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function construct_error_message( $rule, $value ) {
</span><del>- // TODO: better error messages, should include info from callback
- return sprintf( __('The field <strong>%s</strong> has invalid value!'), $rule['field'], $value );
</del><ins>+ $type_field = 'field';
+ $name_field = $rule['field'];
+ $name_rule = str_replace( '_', ' ', $rule['rule'] );
+
+ if( strpos( $name_field, 'translation_' ) === 0 ) {
+ $type_field = 'textarea';
+ $name_field = 'Translation ' . ( intval( substr( $name_field, 12 ) ) + 1 );
+ }
+
+ if ( 'positive' == $rule['kind'] )
+ return sprintf( __('The %s <strong>%s</strong> is invalid and should be %s!'), $type_field, $name_field, $name_rule );
+ else //if ( 'negative' == $rule['kind'] )
+ return sprintf( __('The %s <strong>%s</strong> is invalid and should not be %s!'), $type_field, $name_field, $name_rule );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>