Update/add translator documentation.

[quix0rs-gnu-social.git] / actions / recoverpassword.php

diff --git a/actions/recoverpassword.php b/actions/recoverpassword.php
index c41edaeea409455beba5cd8adde5e1fc841c351d..e30bf7af2e13b52891b0ab6de6c593dfd3cef055 100644 (file)
--- a/actions/recoverpassword.php
+++ b/actions/recoverpassword.php
@@ -162,8 +162,8 @@ class RecoverpasswordAction extends Action
                                  ' the email address you have stored' .
                                  ' in your account.'));
             } else if ($this->mode == 'reset') {
-                // TRANS: Page notice for password change page.
                 $this->element('p', null,
+                               // TRANS: Page notice for password change page.
                                _('You have been identified. Enter a' .
                                  ' new password below.'));
             }
@@ -226,7 +226,7 @@ class RecoverpasswordAction extends Action
          // TRANS: Title for password recovery page in email sent mode.
          case 'sent': return _('Password recovery requested');
          // TRANS: Title for password recovery page in password saved mode.
-         case 'saved': return _('Password saved.');
+         case 'saved': return _('Password saved');
          default:
             // TRANS: Title for password recovery page when an unknown action has been specified.
             return _('Unknown action');
@@ -282,7 +282,11 @@ class RecoverpasswordAction extends Action
         $user = User::staticGet('email', common_canonical_email($nore));
 
         if (!$user) {
-            $user = User::staticGet('nickname', common_canonical_nickname($nore));
+            try {
+                $user = User::staticGet('nickname', common_canonical_nickname($nore));
+            } catch (NicknameException $e) {
+                // invalid
+            }
         }
 
         # See if it's an unconfirmed email address