X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fpasswordsettings.php;h=db36b612a29becfa806733c885e57ff955504f48;hb=c00491cd7a29a9ef16d6e6bfa54505d4c9a522fe;hp=63acba7134d637e5b634afb30eaa6af4d572d1d1;hpb=7cf12f093ed48849ec901038b4cfd44595343c06;p=quix0rs-gnu-social.git

diff --git a/actions/passwordsettings.php b/actions/passwordsettings.php
index 63acba7134..db36b612a2 100644
--- a/actions/passwordsettings.php
+++ b/actions/passwordsettings.php
@@ -143,6 +143,7 @@ class PasswordsettingsAction extends SettingsAction
 
         $token = $this->trimmed('token');
         if (!$token || $token != common_session_token()) {
+            // TRANS: Client error displayed when the session token does not match or is not given.
             $this->showForm(_('There was a problem with your session token. '.
                                'Try again, please.'));
             return;
@@ -156,14 +157,15 @@ class PasswordsettingsAction extends SettingsAction
         $newpassword = $this->arg('newpassword');
         $confirm     = $this->arg('confirm');
 
-        # Some validation
+        // Some validation
 
         if (strlen($newpassword) < 6) {
             // TRANS: Form validation error on page where to change password.
             $this->showForm(_('Password must be 6 or more characters.'));
             return;
         } else if (0 != strcmp($newpassword, $confirm)) {
-            $this->showForm(_('Passwords don\'t match.'));
+            // TRANS: Form validation error on password change when password confirmation does not match.
+            $this->showForm(_('Passwords do not match.'));
             return;
         }
 
@@ -194,10 +196,9 @@ class PasswordsettingsAction extends SettingsAction
             }
 
             if (!$user->update($original)) {
-            // TRANS: Server error displayed on page where to change password when password change
-            // TRANS: could not be made because of a server error.
-            $this->serverError(_('Cannot save new password.'));
-                return;
+                // TRANS: Server error displayed on page where to change password when password change
+                // TRANS: could not be made because of a server error.
+                $this->serverError(_('Cannot save new password.'));
             }
             Event::handle('EndChangePassword', array($user));
         }