Author: sevein
Date: Sat Oct 30 02:53:21 2010
New Revision: 8706
Log:
Use i18n for password validation message and avoid to throw a global error.
Modified:
trunk/apps/qubit/modules/user/actions/passwordEditAction.class.php
trunk/apps/qubit/modules/user/templates/passwordEditSuccess.php
Modified: trunk/apps/qubit/modules/user/actions/passwordEditAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/user/actions/passwordEditAction.class.php Sat Oct
30 02:50:20 2010 (r8705)
+++ trunk/apps/qubit/modules/user/actions/passwordEditAction.class.php Sat Oct
30 02:53:21 2010 (r8706)
@@ -30,9 +30,8 @@
$this->form->getValidatorSchema()->setOption('allow_extra_fields', true);
$this->form->getValidatorSchema()->setPostValidator(new
sfValidatorSchemaCompare(
'password', '==', 'confirmPassword',
- array('throw_global_error' => true),
- array('invalid' => 'Your password confirmation did not match you
password.')
- ));
+ array(),
+ array('invalid' => $this->context->i18n->__('Your password confirmation
did not match you password.'))));
$this->resource = new QubitUser;
if (isset($this->getRoute()->resource))
Modified: trunk/apps/qubit/modules/user/templates/passwordEditSuccess.php
==============================================================================
--- trunk/apps/qubit/modules/user/templates/passwordEditSuccess.php Sat Oct
30 02:50:20 2010 (r8705)
+++ trunk/apps/qubit/modules/user/templates/passwordEditSuccess.php Sat Oct
30 02:53:21 2010 (r8706)
@@ -4,8 +4,6 @@
<h1 class="label"><?php echo render_title($resource) ?></h1>
-<?php echo $form->renderGlobalErrors() ?>
-
<?php echo $form->renderFormTag(url_for(array($resource, 'module' => 'user',
'action' => 'passwordEdit')), array('id' => 'editForm')) ?>
<?php $settings = json_encode(array(
--
You received this message because you are subscribed to the Google Groups
"Qubit Toolkit Commits" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/qubit-commits?hl=en.
