[Mageia-sysadm] [234] merge rev 101 from trunk

[root at mageia.org]

Revision: 234
Author:   misc
Date:     2011-01-06 21:17:36 +0100 (Thu, 06 Jan 2011)
Log Message:
-----------
merge rev 101 from trunk 

Modified Paths:
--------------
    identity/CatDap/branches/live/lib/CatDap/Controller/admin.pm

Modified: identity/CatDap/branches/live/lib/CatDap/Controller/admin.pm
===================================================================
--- identity/CatDap/branches/live/lib/CatDap/Controller/admin.pm	2011-01-06 20:06:41 UTC (rev 233)
+++ identity/CatDap/branches/live/lib/CatDap/Controller/admin.pm	2011-01-06 20:17:36 UTC (rev 234)
@@ -536,7 +536,7 @@
     if ( @{ $c->error } ) {
         my $errors = join "\n",@{ $c->error };
 	$c->log->info("Sending reset mail to $email failed: $errors");
-        $c->response->body($c->loc('An error occured sending the email, but your account was created. Please try the password recovery process f you entered the correct email address: [_1]', $errors));
+        $c->response->body($c->loc('An error occured sending the email, but your account was created. Please try the password recovery process if you entered the correct email address: [_1]', $errors));
         $c->error(0); # Reset the error condition if you need to
     }
     push @errors,$c->loc('Password reset and email sent');
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/mageia-sysadm/attachments/20110106/3589acc9/attachment.html>