Merge branch '0.9.x' into 1.0.x

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

diff --git a/actions/passwordsettings.php b/actions/passwordsettings.php
index c9bd200bd8def93468e369baa00202bc8032bf88..37877931ea2e3557bb0950b8d9aecc752a158ae0 100644 (file)
--- a/actions/passwordsettings.php
+++ b/actions/passwordsettings.php
@@ -106,11 +106,11 @@ class PasswordsettingsAction extends SettingsAction
         }
         $this->elementStart('li');
         $this->password('newpassword', _('New password'),
-                        _('6 or more characters'));
+                        _('6 or more characters.'));
         $this->elementEnd('li');
         $this->elementStart('li');
         $this->password('confirm', _('Confirm'),
-                        _('Same as password above'));
+                        _('Same as password above.'));
         $this->elementEnd('li');
         $this->elementEnd('ul');
 
@@ -128,7 +128,6 @@ class PasswordsettingsAction extends SettingsAction
      *
      * @return void
      */
-
     function handlePost()
     {
         // CSRF protection
@@ -183,7 +182,7 @@ class PasswordsettingsAction extends SettingsAction
             }
 
             if (!$user->update($original)) {
-                $this->serverError(_('Can\'t save new password.'));
+                $this->serverError(_('Cannot save new password.'));
                 return;
             }
             Event::handle('EndChangePassword', array($user));